Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | allow arbitrary routes in dev mode | haraldox | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | navigate to other routes in the console by typing `document.location.href = "#path/to/route"` | |||
* | | | | | | Merge pull request #668 from meetfranz/fix/import-screen-toggles | Stefan Malzner | 2018-02-08 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix import screen toggles | |||
| * | | | | | | [MINOR] remove commented code | haraldox | 2018-02-08 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'develop' into fix/import-screen-toggles | haraldox | 2018-02-08 | |
| |\ \ \ \ \ \ | ||||
| * | | | | | | | fix linting errors | haraldox | 2018-02-08 | |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'develop' into fix/import-screen-toggles | haraldox | 2018-02-08 | |
| |\ \ \ \ \ \ \ | ||||
| * | | | | | | | | fix(App) Bugfix Fix toggle buttons shown during import | haraldox | 2018-02-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved form definition to `componentWillMount` | |||
| * | | | | | | | | fix linting errors | haraldox | 2018-02-06 | |
| | | | | | | | | | ||||
| * | | | | | | | | Merge branch 'develop' into fix/import-screen-toggles | haraldox | 2018-02-06 | |
| |\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | FIX import screen toggles | haraldox | 2018-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix toggle double click event (nested `fields` property) - do not call `prepareForm` for every render but only on init (otherwise all toggles reset to `default: true` | |||
* | | | | | | | | | | Merge pull request #631 from meetfranz/move-subscription-folders | Stefan Malzner | 2018-02-08 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Refactor subscription folders | |||
| * | | | | | | | | | Merge branch 'develop' into move-subscription-folders | Stefan Malzner | 2018-02-02 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||
| * | | | | | | | | | Merge branch 'develop' into move-subscription-folders | haraldox | 2018-01-30 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||
| * | | | | | | | | | Revert "Revert "fix property change due to mobx-react-form update"" | haraldox | 2018-01-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b595dcb997941b418fa8bb1609f54aeb978c91da. | |||
| * | | | | | | | | | fix import path | haraldox | 2018-01-19 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Revert "fix property change due to mobx-react-form update" | haraldox | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34949a6a005df240fa79f679675a0de1f3839776. | |||
| * | | | | | | | | | change directory structure for subscription | haraldox | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move to own sub-folders `subscription` | |||
* | | | | | | | | | | [MINOR] fix linting errors | haraldox | 2018-02-08 | |
| |_|_|_|_|/ / / / |/| | | | | | | | | ||||
* | | | | | | | | | fix(App): Bugfix Fix memory leak in recipe polling loop | haraldox | 2018-02-07 | |
| |_|_|_|/ / / / |/| | | | | | | | ||||
* | | | | | | | | fix `isDevMode` import | haraldox | 2018-02-06 | |
| |_|_|/ / / / |/| | | | | | | ||||
* | | | | | | | [MINOR] isDevMode check in UserStore | haraldox | 2018-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to test routes independently | |||
* | | | | | | | UPDATE electron version | haraldox | 2018-02-06 | |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | fixes security vulnerability CVE-2018–1000006 | |||
* | | | | | | Merge pull request #630 from meetfranz/fix-invite-screen | Stefan Malzner | 2018-01-30 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix invite screen | |||
| * | | | | | fix linting errors | haraldox | 2018-01-30 | |
| | | | | | | ||||
| * | | | | | Merge branch 'develop' into fix-invite-screen | haraldox | 2018-01-30 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||
* | | | | | | Merge pull request #599 from meetfranz/fix-form-validation | Harry | 2018-01-30 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix form validation | |||
| * \ \ \ \ \ | Merge branch 'develop' into fix-form-validation | Stefan Malzner | 2018-01-22 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||
* | | | | | | Merge pull request #584 from meetfranz/fix-service-tooltips-initialization | Stefan Malzner | 2018-01-22 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix service tooltips initialization | |||
| * | | | | | Merge branch 'develop' into fix-service-tooltips-initialization | Stefan Malzner | 2018-01-17 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||
| * | | | | | fix linting issue | haraldox | 2018-01-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | react component lifecycle method order | |||
| * | | | | | Merge branch 'develop' into fix-service-tooltips-initialization | haraldox | 2018-01-17 | |
| | | | | | | ||||
| * | | | | | Fix #32 service tooltips not initialized properly | haraldox | 2018-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 develop | haraldox | 2018-01-16 | |
| |\ \ \ \ \ | ||||
| | | * | | | | fix property change due to mobx-react-form update | haraldox | 2018-01-19 | |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | validate -> validators | |||
| | | * | | | Revert "alternative UX implementation of check for email address count > 0" | haraldox | 2018-01-30 | |
| | | |/ / | | | | | | | | | | | | | | | | This reverts commit 56520969f508c1db257d7573962ad6b762205e56. | |||
| | | * | | alternative UX implementation of check for email address count > 0 | haraldox | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | comment out line 122 to test | |||
| | | * | | implemented check for at least one email address | haraldox | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | realized by leveraging `disabled` attribute of submit button | |||
| | | * | | fix invite screen [object Object] value | haraldox | 2018-01-19 | |
| |_|/ / |/| | | | | | | | | | | | mobx-react-form expects nested `fields` property in array | |||
* | | | | Merge pull request #587 from meetfranz/feature/remove-miner | Stefan Malzner | 2018-01-17 | |
|\ \ \ \ | |/ / / |/| | | | [PR] Remove mining feature to get access to premium features | |||
| * | | | Fix linting issues | Stefan Malzner | 2018-01-17 | |
| | | | | ||||
| * | | | Merge branch 'develop' into feature/remove-miner | Stefan Malzner | 2018-01-17 | |
| |\ \ \ | |/ / / |/| / / | |/ / | ||||
| * | | Remove idle timer dependency | Stefan Malzner | 2017-12-24 | |
| | | | ||||
| * | | Completely remove miner | Stefan Malzner | 2017-12-24 | |
| | | | ||||
| | * | Test nativeImage for @2x images | Stefan Malzner | 2018-02-18 | |
| | | | ||||
| | * | fix(Linux): invert tray icon color & add border for bright UI's | Stefan Malzner | 2018-02-16 | |
| | | | ||||
| | * | Merge pull request #561 from meetfranz/developv5.0.0-beta.15 | Stefan Malzner | 2018-01-11 | |
| | |\ | |_|/ |/| | | Franz Beta 15 | |||
* | | | Merge branch 'develop' of github.com:meetfranz/franz into develop | Stefan Malzner | 2018-01-10 | |
|\ \ \ | ||||
| * \ \ | Merge pull request #417 from meetfranz/i18n | Stefan Malzner | 2018-01-10 | |
| |\ \ \ | | | | | | | | | | | [PR] translation update | |||
| | * | | | Automatic i18n update (i18n.meetfranz.com) | FranzBot | 2018-01-10 | |
| | | | | | ||||
| | * | | | Automatic i18n update (i18n.meetfranz.com) | FranzBot | 2018-01-08 | |
| | | | | |