aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
...
* | | | | | 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
* | | | | | | UPDATE electron versionLibravatar 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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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
| |_|/ / / / |/| | | | |
| | | * | | Revert "alternative UX implementation of check for email address count > 0"Libravatar haraldox2018-01-30
| | | |/ /
| | | * | 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
| |_|/ / |/| | |
* | | | 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
| |\ \ \ | |/ / / |/| / / | |/ /
| * | Remove idle timer dependencyLibravatar Stefan Malzner2017-12-24
| * | Completely remove minerLibravatar Stefan Malzner2017-12-24
| | * Test nativeImage for @2x imagesLibravatar Stefan Malzner2018-02-18
| | * fix(Linux): invert tray icon color & add border for bright UI'sLibravatar Stefan Malzner2018-02-16
| | * Merge pull request #561 from meetfranz/developv5.0.0-beta.15Libravatar Stefan Malzner2018-01-11
| | |\ | |_|/ |/| |
* | | 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
| | |\ \ \