aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge pull request #668 from meetfranz/fix/import-screen-togglesLibravatar Stefan Malzner2018-02-08
|\ | | | | Fix import screen toggles
| * [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
| | | | | | | | | | | | | | | | moved form definition to `componentWillMount`
| * | | fix linting errorsLibravatar haraldox2018-02-06
| | | |
| * | | Merge branch 'develop' into fix/import-screen-togglesLibravatar haraldox2018-02-06
| |\ \ \
| * | | | FIX import screen togglesLibravatar haraldox2018-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-foldersLibravatar Stefan Malzner2018-02-08
|\ \ \ \ \ | |_|_|_|/ |/| | | | Refactor subscription folders
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b595dcb997941b418fa8bb1609f54aeb978c91da.
| * | | | | | fix import pathLibravatar haraldox2018-01-19
| | | | | | |
| * | | | | | Revert "fix property change due to mobx-react-form update"Libravatar haraldox2018-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34949a6a005df240fa79f679675a0de1f3839776.
| * | | | | | change directory structure for subscriptionLibravatar haraldox2018-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | move to own sub-folders `subscription`
* | | | | | | [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
| | | | | | | | | | | | | | | | to test routes independently
* | | | UPDATE electron versionLibravatar haraldox2018-02-06
| |_|/ |/| | | | | | | | fixes security vulnerability CVE-2018–1000006
* | | Merge pull request #630 from meetfranz/fix-invite-screenLibravatar Stefan Malzner2018-01-30
|\ \ \ | |_|/ |/| | Fix invite screen
| * | 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
|\ \ \ | | | | | | | | 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
| | | * Revert "alternative UX implementation of check for email address count > 0"Libravatar haraldox2018-01-30
| | | | | | | | | | | | | | | | This reverts commit 56520969f508c1db257d7573962ad6b762205e56.
| | | * 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
* | | 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
| | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-19 08:33:23 +0000