aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [MINOR] REMOVE unnecessary varLibravatar haraldox2018-02-06
| | | | `pathname`
* REMOVE invite button from Account DashboardLibravatar haraldox2018-02-03
|
* fix defaultPropsLibravatar haraldox2018-02-02
|
* fix linting errorsLibravatar haraldox2018-02-02
|
* finished embedded invite functionalityLibravatar haraldox2018-02-02
| | | | | | ADDED internationalization ADDED loading indicator in send button REMOVED query param `from`
* got server callback and infobox workingLibravatar haraldox2018-02-02
|
* [WIP] started work on infoboxLibravatar haraldox2018-01-30
|
* [MINOR] fix indentationLibravatar haraldox2018-01-30
| | | | makes linter happy
* ADDED embedded invite screen in settingsLibravatar haraldox2018-01-30
| | | | reuses component `Invite`
* ADDED invite button on settings navigationLibravatar haraldox2018-01-30
| | | | currently goes to `auth/signup/invite` route only
* Merge branch 'fix-invite-screen' into feature/invite-buttonLibravatar haraldox2018-01-30
| | | | fix linitng errors
* Merge branch 'develop' into feature/invite-buttonLibravatar haraldox2018-01-30
|\
| * Merge pull request #599 from meetfranz/fix-form-validationLibravatar Harry2018-01-30
| |\ | | | | | | Fix form validation
| | * Merge branch 'develop' into fix-form-validationLibravatar Stefan Malzner2018-01-22
| | |\ | | |/ | |/|
| * | Merge pull request #584 from meetfranz/fix-service-tooltips-initializationLibravatar Stefan Malzner2018-01-22
| |\ \ | | | | | | | | Fix service tooltips initialization
| | * \ Merge branch 'develop' into fix-service-tooltips-initializationLibravatar Stefan Malzner2018-01-17
| | |\ \ | | |/ / | |/| |
| | * | fix linting issueLibravatar haraldox2018-01-17
| | | | | | | | | | | | | | | | react component lifecycle method order
| | * | Merge branch 'develop' into fix-service-tooltips-initializationLibravatar haraldox2018-01-17
| | | |
| | * | Fix #32 service tooltips not initialized properlyLibravatar haraldox2018-01-16
| | | | | | | | | | | | | | | | tooltips have to be rebuilt when services are added (ReactTooltip seems to cache them at first render)
| | * | Merge branch 'feature/remove-miner' into developLibravatar haraldox2018-01-16
| | |\ \
| | | | * fix property change due to mobx-react-form updateLibravatar haraldox2018-01-19
| | |_|/ | |/| | | | | | | | | | validate -> validators
* | | | Merge branch 'fix-invite-screen' into feature/invite-buttonLibravatar haraldox2018-01-29
|\ \ \ \
| * | | | alternative UX implementation of check for email address count > 0Libravatar haraldox2018-01-19
| | | | | | | | | | | | | | | | | | | | comment out line 122 to test
| * | | | implemented check for at least one email addressLibravatar haraldox2018-01-19
| | | | | | | | | | | | | | | | | | | | realized by leveraging `disabled` attribute of submit button
| * | | | fix invite screen [object Object] valueLibravatar haraldox2018-01-19
| |/ / / | | | | | | | | | | | | mobx-react-form expects nested `fields` property in array
* | | | return to account screen from invite screenLibravatar haraldox2018-01-22
| | | | | | | | | | | | | | | | cheap solution because `state` prop of `<Link>` is not being passed to route
* | | | ADDED invite button in Account SettingsLibravatar haraldox2018-01-21
| | | | | | | | | | | | | | | | [WIP] return to previous route on submit / cancel
* | | | allow arbitrary routes in dev modeLibravatar haraldox2018-01-19
|/ / / | | | | | | | | | navigate to other routes in the console by typing `document.location.href = "#path/to/route"`
* | | Merge pull request #587 from meetfranz/feature/remove-minerLibravatar Stefan Malzner2018-01-17
|\ \ \ | |/ / |/| | [PR] Remove mining feature to get access to premium features
| * | Fix linting issuesLibravatar Stefan Malzner2018-01-17
| | |
| * | Merge branch 'develop' into feature/remove-minerLibravatar Stefan Malzner2018-01-17
| |\ \ | |/ / |/| / | |/
* | Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2018-01-10
|\ \
| * \ Merge pull request #417 from meetfranz/i18nLibravatar Stefan Malzner2018-01-10
| |\ \ | | | | | | | | [PR] translation update
| | * | Automatic i18n update (i18n.meetfranz.com)Libravatar FranzBot2018-01-10
| | | |
| | * | Automatic i18n update (i18n.meetfranz.com)Libravatar FranzBot2018-01-08
| | | |
| | * | Merge branch 'develop' into i18nLibravatar Stefan Malzner2018-01-08
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/i18n/languages.js
| | * | | Sort languages by nameLibravatar Stefan Malzner2017-12-07
| | | | |
| | * | | fix(Translations): Use the native language name for translationsLibravatar Stefan Malzner2017-12-07
| | | | |
| | * | | feat(Translations): Added Chinese (Taiwan), Croatian, Greek, Serbian, TurkishLibravatar Stefan Malzner2017-12-07
| | | | |
| | * | | Automatic i18n update (i18n.meetfranz.com)Libravatar FranzBot2017-12-07
| | | | |
| | * | | Add dummies for new languagesLibravatar Stefan Malzner2017-12-07
| | | | |
| | * | | Automatic i18n update (i18n.meetfranz.com)Libravatar FranzBot2017-12-07
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into developLibravatar Stefan Malzner2018-01-10
|\ \ \ \ \
| * | | | | Fix link to service request formLibravatar Stefan Malzner2018-01-10
| | | | | |
* | | | | | Update changelogLibravatar Stefan Malzner2018-01-10
| | | | | |
* | | | | | Bump version to beta 15Libravatar Stefan Malzner2018-01-10
| |/ / / / |/| | | |
* | | | | Fix issue with custom icon on service creationLibravatar Stefan Malzner2018-01-10
| |_|/ / |/| | |
* | | | Add color to service iconsLibravatar Stefan Malzner2018-01-07
| | | |
* | | | Merge pull request #525 from meetfranz/feature/icon-uploadLibravatar Stefan Malzner2018-01-06
|\ \ \ \ | | | | | | | | | | [PR] Feature/icon upload
| * | | | fix displaying old icon while uploading new iconLibravatar Stefan Malzner2018-01-06
| | | | |