Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'fix-invite-screen' into feature/invite-button | 2018-01-30 | |
| | | | | fix linitng errors | ||
* | Merge branch 'develop' into feature/invite-button | 2018-01-30 | |
|\ | |||
| * | Merge branch 'develop' into fix-form-validation | 2018-01-22 | |
| |\ | |||
| | * | fix linting issue | 2018-01-17 | |
| | | | | | | | | | | | | react component lifecycle method order | ||
| | * | Merge branch 'develop' into fix-service-tooltips-initialization | 2018-01-17 | |
| | | | |||
| | * | Fix #32 service tooltips not initialized properly | 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 | 2018-01-16 | |
| | |\ | |||
| * | | | fix property change due to mobx-react-form update | 2018-01-19 | |
| | | | | | | | | | | | | | | | | validate -> validators | ||
* | | | | Merge branch 'fix-invite-screen' into feature/invite-button | 2018-01-29 | |
|\ \ \ \ | |||
| * | | | | alternative UX implementation of check for email address count > 0 | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | comment out line 122 to test | ||
| * | | | | implemented check for at least one email address | 2018-01-19 | |
| | | | | | | | | | | | | | | | | | | | | realized by leveraging `disabled` attribute of submit button | ||
| * | | | | fix invite screen [object Object] value | 2018-01-19 | |
| |/ / / | | | | | | | | | | | | | mobx-react-form expects nested `fields` property in array | ||
* | | | | return to account screen from invite screen | 2018-01-22 | |
| | | | | | | | | | | | | | | | | cheap solution because `state` prop of `<Link>` is not being passed to route | ||
* | | | | ADDED invite button in Account Settings | 2018-01-21 | |
| | | | | | | | | | | | | | | | | [WIP] return to previous route on submit / cancel | ||
* | | | | allow arbitrary routes in dev mode | 2018-01-19 | |
|/ / / | | | | | | | | | | navigate to other routes in the console by typing `document.location.href = "#path/to/route"` | ||
* | | | Fix linting issues | 2018-01-17 | |
| | | | |||
* | | | Merge branch 'develop' into feature/remove-miner | 2018-01-17 | |
|\| | | |/ |/| | |||
| * | Merge pull request #417 from meetfranz/i18n | 2018-01-10 | |
| |\ | | | | | | | [PR] translation update | ||
| | * | Automatic i18n update (i18n.meetfranz.com) | 2018-01-10 | |
| | | | |||
| | * | Automatic i18n update (i18n.meetfranz.com) | 2018-01-08 | |
| | | | |||
| | * | Merge branch 'develop' into i18n | 2018-01-08 | |
| | |\ | | | | | | | | | | | | | | | | | # Conflicts: # src/i18n/languages.js | ||
| | * | | Sort languages by name | 2017-12-07 | |
| | | | | |||
| | * | | fix(Translations): Use the native language name for translations | 2017-12-07 | |
| | | | | |||
| | * | | feat(Translations): Added Chinese (Taiwan), Croatian, Greek, Serbian, Turkish | 2017-12-07 | |
| | | | | |||
| | * | | Automatic i18n update (i18n.meetfranz.com) | 2017-12-07 | |
| | | | | |||
| | * | | Add dummies for new languages | 2017-12-07 | |
| | | | | |||
| | * | | Automatic i18n update (i18n.meetfranz.com) | 2017-12-07 | |
| | | | | |||
| * | | | Fix issue with custom icon on service creation | 2018-01-10 | |
| | |/ | |/| | |||
| * | | Add color to service icons | 2018-01-07 | |
| | | | |||
| * | | Merge pull request #525 from meetfranz/feature/icon-upload | 2018-01-06 | |
| |\ \ | | | | | | | | | [PR] Feature/icon upload | ||
| | * | | fix displaying old icon while uploading new icon | 2018-01-06 | |
| | | | | |||
| | * | | Fix issue when deleting and reuploading an icon | 2018-01-05 | |
| | | | | |||
| | * | | feat(Service): Add custom service icon upload | 2018-01-02 | |
| | | | | |||
| | * | | First working draft of icon upload | 2017-12-27 | |
| | | | | |||
| | * | | Merge branch 'develop' into feature/icon-upload | 2017-12-24 | |
| | |\ \ | |||
| | * | | | [wip] add icon upload | 2017-11-12 | |
| | | | | | |||
| * | | | | Merge pull request #541 from meetfranz/feature/external-links | 2018-01-05 | |
| |\ \ \ \ | | | | | | | | | | | | | [PR] Improve external link handling | ||
| | * | | | | feat(Services): Improve handling of external links | 2018-01-05 | |
| | | | | | | |||
| | * | | | | Improve annoying livereload reload behaviour for main/webview processes | 2018-01-05 | |
| | | | | | | |||
| * | | | | | Merge branch 'develop' into bug-fixes | 2018-01-04 | |
| |\| | | | | |||
| | * | | | | Merge branch 'service-cache-cleanup' of https://github.com/dannyqiu/franz ↵ | 2018-01-04 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into feature/service-cache-cleanup | ||
| | | * \ \ \ | Merge branch 'develop' into service-cache-cleanup | 2018-01-03 | |
| | | |\ \ \ \ | |||
| | | | * | | | | feat(Services): Improve user experience of service search | 2018-01-03 | |
| | | | | | | | | |||
| | | | * | | | | Merge pull request #506 from meetfranz/feature/reactivate-franz | 2018-01-02 | |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Fix service reload after waking machine up | ||
| | | | | * | | | | Fix linting issues pt 2 | 2017-12-26 | |
| | | | | | | | | | |||
| | | | | * | | | | Fix linting issue | 2017-12-24 | |
| | | | | | | | | | |||
| | | | | * | | | | fix(App): Fix service reload after waking machine up | 2017-12-24 | |
| | | | | | |/ / | | | | | |/| | | |||
| | | | * | | | | Merge pull request #502 from meetfranz/feature/reload-service-root | 2018-01-02 | |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [PR] Reload service root | ||
| | | | | * | | | | fix(Service): Ctrl/Cmd+R now navigates back to the service root | 2017-12-23 | |
| | | | | |/ / / | |||
| | | | * | | | | fix(Service): Fix indirect message badge being displayed when badge is disabled | 2018-01-02 | |
| | | | |\ \ \ \ |