aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* REMOVE presentational stuff from smart containerLibravatar haraldox2018-02-08
* [MINOR] ADD blank lineLibravatar haraldox2018-02-06
* [MINOR] house cleaningLibravatar haraldox2018-02-06
* Merge branch 'develop' into feature/invite-buttonLibravatar haraldox2018-02-06
|\
| * Merge pull request #630 from meetfranz/fix-invite-screenLibravatar Stefan Malzner2018-01-30
| |\
| | * fix linting errorsLibravatar haraldox2018-01-30
| | * Merge branch 'develop' into fix-invite-screenLibravatar haraldox2018-01-30
| | |\ | | |/ | |/|
| | * Revert "alternative UX implementation of check for email address count > 0"Libravatar haraldox2018-01-30
* | | [MINOR] REMOVE unnecessary varLibravatar haraldox2018-02-06
* | | 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
* | | got server callback and infobox workingLibravatar haraldox2018-02-02
* | | [WIP] started work on infoboxLibravatar haraldox2018-01-30
* | | [MINOR] fix indentationLibravatar haraldox2018-01-30
* | | ADDED embedded invite screen in settingsLibravatar haraldox2018-01-30
* | | ADDED invite button on settings navigationLibravatar haraldox2018-01-30
* | | Merge branch 'fix-invite-screen' into feature/invite-buttonLibravatar haraldox2018-01-30
* | | Merge branch 'develop' into feature/invite-buttonLibravatar haraldox2018-01-30
|\| |
| * | Merge pull request #599 from meetfranz/fix-form-validationLibravatar Harry2018-01-30
| |\ \
| | * \ 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
| |\ \ \
| | * \ \ Merge branch 'develop' into fix-service-tooltips-initializationLibravatar Stefan Malzner2018-01-17
| | |\ \ \ | | |/ / / | |/| | |
| | * | | fix linting issueLibravatar haraldox2018-01-17
| | * | | Merge branch 'develop' into fix-service-tooltips-initializationLibravatar haraldox2018-01-17
| | * | | Fix #32 service tooltips not initialized properlyLibravatar haraldox2018-01-16
| | * | | Merge branch 'feature/remove-miner' into developLibravatar haraldox2018-01-16
| | |\ \ \
| | | | * | fix property change due to mobx-react-form updateLibravatar haraldox2018-01-19
| | |_|/ / | |/| | |
* | | | | 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
| * | | | implemented check for at least one email addressLibravatar haraldox2018-01-19
| * | | | fix invite screen [object Object] valueLibravatar haraldox2018-01-19
| |/ / /
* | | | return to account screen from invite screenLibravatar haraldox2018-01-22
* | | | ADDED invite button in Account SettingsLibravatar haraldox2018-01-21
* | | | allow arbitrary routes in dev modeLibravatar haraldox2018-01-19
|/ / /
* | | Merge pull request #587 from meetfranz/feature/remove-minerLibravatar Stefan Malzner2018-01-17
|\ \ \ | |/ / |/| |
| * | 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
| |\ \
| | * | 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
| | |\ \
| | * | | 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