aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'fix/copy-paste' into developLibravatar haraldox2018-02-16
|\
| * trying to get to the bottom of thisLibravatar haraldox2018-02-16
* | Merge branch 'fix/sleep' into developLibravatar haraldox2018-02-16
|\ \
| * | reload Franz instead of all services on sleep resumeLibravatar haraldox2018-02-16
| |/
* | inverted welcome button "Create a free account"Libravatar haraldox2018-02-16
* | fix teamId & customUrl validation for hosted optionLibravatar haraldox2018-02-16
* | fix validation for side-by-side teamId & customURLLibravatar haraldox2018-02-16
|/
* [MINOR] string correctionLibravatar haraldox2018-02-16
* ADD strings for branch feat/hide-dock-iconLibravatar haraldox2018-02-15
* Merge pull request #654 from meetfranz/feature/invite-buttonLibravatar Stefan Malzner2018-02-12
|\
| * feat(App) Feature Invite Friends in SettingsLibravatar haraldox2018-02-08
| * REMOVE presentational stuff from smart containerLibravatar haraldox2018-02-08
| * [MINOR] ADD blank lineLibravatar haraldox2018-02-06
| * [MINOR] house cleaningLibravatar haraldox2018-02-06
| * [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 branch 'fix-invite-screen' into feature/invite-buttonLibravatar haraldox2018-01-29
| |\ \
| * | | 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 #668 from meetfranz/fix/import-screen-togglesLibravatar Stefan Malzner2018-02-08
|\ \ \ \
| * | | | [MINOR] remove commented codeLibravatar haraldox2018-02-08
| * | | | Merge branch 'develop' into fix/import-screen-togglesLibravatar haraldox2018-02-08
| |\ \ \ \
| * | | | | fix linting errorsLibravatar haraldox2018-02-08
| * | | | | Merge branch 'develop' into fix/import-screen-togglesLibravatar haraldox2018-02-08
| |\ \ \ \ \
| * | | | | | fix(App) Bugfix Fix toggle buttons shown during importLibravatar haraldox2018-02-08
| * | | | | | fix linting errorsLibravatar haraldox2018-02-06
| * | | | | | Merge branch 'develop' into fix/import-screen-togglesLibravatar haraldox2018-02-06
| |\ \ \ \ \ \
| * | | | | | | FIX import screen togglesLibravatar haraldox2018-02-06
* | | | | | | | Merge pull request #631 from meetfranz/move-subscription-foldersLibravatar Stefan Malzner2018-02-08
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'develop' into move-subscription-foldersLibravatar Stefan Malzner2018-02-02
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into move-subscription-foldersLibravatar haraldox2018-01-30
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Revert "Revert "fix property change due to mobx-react-form update""Libravatar haraldox2018-01-30
| * | | | | | | | fix import pathLibravatar haraldox2018-01-19
| * | | | | | | | Revert "fix property change due to mobx-react-form update"Libravatar haraldox2018-01-19
| * | | | | | | | change directory structure for subscriptionLibravatar haraldox2018-01-19
* | | | | | | | | [MINOR] fix linting errorsLibravatar haraldox2018-02-08
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | fix(App): Bugfix Fix memory leak in recipe polling loopLibravatar haraldox2018-02-07
| |_|_|_|/ / / |/| | | | | |
* | | | | | | fix `isDevMode` importLibravatar haraldox2018-02-06
| |_|_|/ / / |/| | | | |
* | | | | | [MINOR] isDevMode check in UserStoreLibravatar haraldox2018-02-06
| |_|/ / / |/| | | |