aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Recipe Notification API refactorLibravatar Stefan Malzner2017-10-30
| | | | Fixes: #104
* Merge pull request #176 from meetfranz/feature/fix-hosted-service-importLibravatar Stefan Malzner2017-10-30
|\ | | | | fix(Service Import): Fix issue with import of on-premise services
| * fix(Service Import): Fix issue with import of on-premise servicesLibravatar Stefan Malzner2017-10-30
|/
* Merge pull request #160 from GustavoKatel/notificationTitleFixLibravatar Stefan Malzner2017-10-30
|\ | | | | Add onNotify event to let recipes update/change notifications before send them.
| * Merge branch 'develop' into notificationTitleFixLibravatar Stefan Malzner2017-10-30
| |\ | |/ |/|
* | Merge pull request #155 from dannyqiu/fix-theme-changeLibravatar Stefan Malzner2017-10-30
|\ \ | | | | | | Change tray icon on mac theme change
| * \ Merge branch 'develop' into fix-theme-changeLibravatar Stefan Malzner2017-10-30
| |\ \ | |/ / |/| |
* | | Merge pull request #153 from dannyqiu/fix-high-sierra-buildLibravatar Stefan Malzner2017-10-30
|\ \ \ | | | | | | | | Update electron-spellchecker dependency
| * \ \ Merge branch 'develop' into fix-high-sierra-buildLibravatar Stefan Malzner2017-10-30
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #151 from meetfranz/feature/shortcutsLibravatar Stefan Malzner2017-10-30
|\ \ \ \ | | | | | | | | | | Improve shortcuts
| * \ \ \ Merge branch 'develop' into feature/shortcutsLibravatar Stefan Malzner2017-10-30
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #150 from meetfranz/feature/menuLibravatar Stefan Malzner2017-10-30
|\ \ \ \ \ | | | | | | | | | | | | Improve app menu
| * \ \ \ \ Merge branch 'develop' into feature/menuLibravatar Stefan Malzner2017-10-30
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #169 from dannyqiu/fix-service-statusLibravatar Stefan Malzner2017-10-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reset status when navigating away from services screen
| * | | | | | Reset setting status when navigating away from services screenLibravatar Danny Qiu2017-10-29
|/ / / / / /
* | | | | | Merge pull request #157 from RainoBoy97/masterLibravatar Stefan Malzner2017-10-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | [translation] Add norwegian translations
| * \ \ \ \ \ Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-29
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #164 from dnlup/italian-translationLibravatar Stefan Malzner2017-10-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | feat(locales): Add italian translation
| * \ \ \ \ \ \ Merge branch 'develop' into italian-translationLibravatar Stefan Malzner2017-10-29
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix(lint): Fix missing trailing commaLibravatar dnlup2017-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing trailing comma after `it` value in franz/src/i18n/languages.js.
| * | | | | | | feat(locales): Add italian translationLibravatar dnlup2017-10-28
| | | | | | | |
| | * | | | | | Add missing trailing commaLibravatar Raino2017-10-27
| | | | | | | |
| | * | | | | | Fix merge conflict and add missing translationLibravatar Raino2017-10-27
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | [translation] Add norwegian translationsLibravatar Raino2017-10-27
| |/ / / / / /
| | * | | | | Fix linting issuesLibravatar Stefan Malzner2017-10-27
| | | | | | |
| | * | | | | Remove additional production shortcuts for devtoolsLibravatar Stefan Malzner2017-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the menu update we now show use the standard shortcuts for opening the dev tools.
| | * | | | | Add info & support links to "Help" menuLibravatar Stefan Malzner2017-10-27
| | | | | | |
| | * | | | | feat(Menu): Add "About Franz" Menu item to Windows/LinuxLibravatar Stefan Malzner2017-10-27
| | | | | | |
| | | * | | | Add Linux specific definition for shortcut previewLibravatar Stefan Malzner2017-10-27
| | | | | | |
| | | * | | | fix(Shortcuts): Use `Alt+[0-9]` for tab switching on Linux`Libravatar Stefan Malzner2017-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #148
| | | * | | | feat(Menu): Add menu item to toggle (service) dev toolsLibravatar Stefan Malzner2017-10-27
| | | | | | |
| | | * | | | fix(Shortcuts): Flip shortcut to navigate to next/previous serviceLibravatar Stefan Malzner2017-10-27
| | |/ / / /
| | | * | | Merge branch 'master' into fix-high-sierra-buildLibravatar Danny Qiu2017-10-27
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | * | | Update electron-spellchecker dependencyLibravatar Danny Qiu2017-10-27
| | | | | |
| | | | * | Change tray icon on mac theme changeLibravatar Danny Qiu2017-10-27
| |_|_|/ / |/| | | |
| | | | * Add onNotify event to let recipes update/change notifications before send them.Libravatar Gustavo Sampaio2017-10-27
| |_|_|/ |/| | | | | | | | | | | Add additional checks in ServiceStore.
* | | | Merge pull request #152 from meetfranz/chore/travis-setupLibravatar Stefan Malzner2017-10-27
|\ \ \ \ | |_|/ / |/| | | Add Linux build to Travis config
| * | | Merge branch 'develop' into chore/travis-setupLibravatar Stefan Malzner2017-10-27
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #141 from DBozhinovski/masterLibravatar Stefan Malzner2017-10-27
|\ \ \ \ | | | | | | | | | | Fixes addNewService, same issue as #111
| * \ \ \ Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #137 from GustavoKatel/orderingJumpFixLibravatar Stefan Malzner2017-10-27
|\ \ \ \ \ | | | | | | | | | | | | Bugfix: When reordering make sure the new indexes are applied correctly
| * \ \ \ \ Merge branch 'develop' into orderingJumpFixLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #139 from Jensderond/patch-1Libravatar Stefan Malzner2017-10-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | [translation] Update Dutch(nl-NL)
| * \ \ \ \ \ Merge branch 'develop' into patch-1Libravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #134 from atakangktepe/fix_trayLibravatar Stefan Malzner2017-10-27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed 'Show Franz' button in tray
| * \ \ \ \ \ \ Merge branch 'develop' into fix_trayLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'develop' into fix_trayLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ \
| * | | | | | | | Removed mainWindow parameter from Tray classLibravatar Atakan Goktepe2017-10-27
| | | | | | | | |
| * | | | | | | | Fixed 'Show Franz' button in trayLibravatar Atakan Goktepe2017-10-26
| | |_|_|_|_|_|/ | |/| | | | | |