Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | finished embedded invite functionality | haraldox | 2018-02-02 |
| | | | | | | ADDED internationalization ADDED loading indicator in send button REMOVED query param `from` | ||
* | got server callback and infobox working | haraldox | 2018-02-02 |
| | |||
* | [WIP] started work on infobox | haraldox | 2018-01-30 |
| | |||
* | [MINOR] fix indentation | haraldox | 2018-01-30 |
| | | | | makes linter happy | ||
* | ADDED embedded invite screen in settings | haraldox | 2018-01-30 |
| | | | | reuses component `Invite` | ||
* | ADDED invite button on settings navigation | haraldox | 2018-01-30 |
| | | | | currently goes to `auth/signup/invite` route only | ||
* | Merge branch 'fix-invite-screen' into feature/invite-button | haraldox | 2018-01-30 |
| | | | | fix linitng errors | ||
* | Merge branch 'develop' into feature/invite-button | 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 | ||
* | | | | Merge branch 'fix-invite-screen' into feature/invite-button | haraldox | 2018-01-29 |
|\ \ \ \ | |||
| * | | | | 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 | ||
* | | | | return to account screen from invite screen | haraldox | 2018-01-22 |
| | | | | | | | | | | | | | | | | cheap solution because `state` prop of `<Link>` is not being passed to route | ||
* | | | | ADDED invite button in Account Settings | haraldox | 2018-01-21 |
| | | | | | | | | | | | | | | | | [WIP] return to previous route on submit / cancel | ||
* | | | | 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 #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 |
| |\ \ | |/ / |/| / | |/ | |||
* | | 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 |
| | | | | |||
| | * | | Merge branch 'develop' into i18n | Stefan Malzner | 2018-01-08 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/i18n/languages.js | ||
| | * | | | Sort languages by name | Stefan Malzner | 2017-12-07 |
| | | | | | |||
| | * | | | fix(Translations): Use the native language name for translations | Stefan Malzner | 2017-12-07 |
| | | | | | |||
| | * | | | feat(Translations): Added Chinese (Taiwan), Croatian, Greek, Serbian, Turkish | Stefan Malzner | 2017-12-07 |
| | | | | | |||
| | * | | | Automatic i18n update (i18n.meetfranz.com) | FranzBot | 2017-12-07 |
| | | | | | |||
| | * | | | Add dummies for new languages | Stefan Malzner | 2017-12-07 |
| | | | | | |||
| | * | | | Automatic i18n update (i18n.meetfranz.com) | FranzBot | 2017-12-07 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'origin/master' into develop | Stefan Malzner | 2018-01-10 |
|\ \ \ \ \ | |||
| * | | | | | Fix link to service request form | Stefan Malzner | 2018-01-10 |
| | | | | | | |||
* | | | | | | Update changelog | Stefan Malzner | 2018-01-10 |
| | | | | | | |||
* | | | | | | Bump version to beta 15 | Stefan Malzner | 2018-01-10 |
| |/ / / / |/| | | | | |||
* | | | | | Fix issue with custom icon on service creation | Stefan Malzner | 2018-01-10 |
| |_|/ / |/| | | | |||
* | | | | Add color to service icons | Stefan Malzner | 2018-01-07 |
| | | | | |||
* | | | | Merge pull request #525 from meetfranz/feature/icon-upload | Stefan Malzner | 2018-01-06 |
|\ \ \ \ | | | | | | | | | | | [PR] Feature/icon upload | ||
| * | | | | fix displaying old icon while uploading new icon | Stefan Malzner | 2018-01-06 |
| | | | | | |||
| * | | | | Fix issue when deleting and reuploading an icon | Stefan Malzner | 2018-01-05 |
| | | | | | |||
| * | | | | feat(Service): Add custom service icon upload | Stefan Malzner | 2018-01-02 |
| | | | | | |||
| * | | | | First working draft of icon upload | Stefan Malzner | 2017-12-27 |
| | | | | | |||
| * | | | | Merge branch 'develop' into feature/icon-upload | Stefan Malzner | 2017-12-24 |
| |\ \ \ \ |