Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | Merge branch 'develop' into fix-high-sierra-build | 2017-10-30 | ||
| |\ \ \ \ | |/ / / / |/| | | | | ||||
* | | | | | Merge pull request #151 from meetfranz/feature/shortcuts | 2017-10-30 | ||
|\ \ \ \ \ | ||||
| * \ \ \ \ | Merge branch 'develop' into feature/shortcuts | 2017-10-30 | ||
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||
* | | | | | | Merge pull request #150 from meetfranz/feature/menu | 2017-10-30 | ||
|\ \ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge branch 'develop' into feature/menu | 2017-10-30 | ||
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
* | | | | | | | Merge pull request #169 from dannyqiu/fix-service-status | 2017-10-30 | ||
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Reset setting status when navigating away from services screen | 2017-10-29 | ||
|/ / / / / / / | ||||
* | | | | | | | Merge pull request #157 from RainoBoy97/master | 2017-10-29 | ||
|\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' into master | 2017-10-29 | ||
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||
* | | | | | | | | Merge pull request #164 from dnlup/italian-translation | 2017-10-29 | ||
|\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into italian-translation | 2017-10-29 | ||
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||
| * | | | | | | | | fix(lint): Fix missing trailing comma | 2017-10-28 | ||
| * | | | | | | | | feat(locales): Add italian translation | 2017-10-28 | ||
| | |_|_|_|_|_|/ | |/| | | | | | | ||||
| | * | | | | | | Add missing trailing comma | 2017-10-27 | ||
| | * | | | | | | Fix merge conflict and add missing translation | 2017-10-27 | ||
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||
| | * | | | | | | [translation] Add norwegian translations | 2017-10-27 | ||
| |/ / / / / / | ||||
| | * | | | | | Fix linting issues | 2017-10-27 | ||
| | * | | | | | Remove additional production shortcuts for devtools | 2017-10-27 | ||
| | * | | | | | Add info & support links to "Help" menu | 2017-10-27 | ||
| | * | | | | | feat(Menu): Add "About Franz" Menu item to Windows/Linux | 2017-10-27 | ||
| | | * | | | | Add Linux specific definition for shortcut preview | 2017-10-27 | ||
| | | * | | | | fix(Shortcuts): Use `Alt+[0-9]` for tab switching on Linux` | 2017-10-27 | ||
| | | * | | | | feat(Menu): Add menu item to toggle (service) dev tools | 2017-10-27 | ||
| | | * | | | | fix(Shortcuts): Flip shortcut to navigate to next/previous service | 2017-10-27 | ||
| | |/ / / / | ||||
| | | * | | | Merge branch 'master' into fix-high-sierra-build | 2017-10-27 | ||
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| | | * | | | Update electron-spellchecker dependency | 2017-10-27 | ||
| | | | * | | Change tray icon on mac theme change | 2017-10-27 | ||
| |_|_|/ / |/| | | | | ||||
| | | | * | Add onNotify event to let recipes update/change notifications before send them. | 2017-10-27 | ||
| |_|_|/ |/| | | | ||||
* | | | | Merge pull request #152 from meetfranz/chore/travis-setup | 2017-10-27 | ||
|\ \ \ \ | |_|/ / |/| | | | ||||
| * | | | Merge branch 'develop' into chore/travis-setup | 2017-10-27 | ||
| |\ \ \ | |/ / / |/| | | | ||||
* | | | | Merge pull request #141 from DBozhinovski/master | 2017-10-27 | ||
|\ \ \ \ | ||||
| * \ \ \ | Merge branch 'develop' into master | 2017-10-27 | ||
| |\ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | Merge branch 'develop' into master | 2017-10-27 | ||
| |\ \ \ \ | |/ / / / |/| | | | | ||||
* | | | | | Merge pull request #137 from GustavoKatel/orderingJumpFix | 2017-10-27 | ||
|\ \ \ \ \ | ||||
| * \ \ \ \ | Merge branch 'develop' into orderingJumpFix | 2017-10-27 | ||
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||
* | | | | | | Merge pull request #139 from Jensderond/patch-1 | 2017-10-27 | ||
|\ \ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge branch 'develop' into patch-1 | 2017-10-27 | ||
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
* | | | | | | | Merge pull request #134 from atakangktepe/fix_tray | 2017-10-27 | ||
|\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' into fix_tray | 2017-10-27 | ||
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||
| * | | | | | | | Merge branch 'develop' into fix_tray | 2017-10-27 | ||
| |\ \ \ \ \ \ \ | ||||
| * | | | | | | | | Removed mainWindow parameter from Tray class | 2017-10-27 | ||
| * | | | | | | | | Fixed 'Show Franz' button in tray | 2017-10-26 | ||
| | |_|_|_|_|_|/ | |/| | | | | | | ||||
| | | * | | | | | Merge branch 'develop' into patch-1 | 2017-10-27 | ||
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||
* | | | | | | | | Merge pull request #123 from phmigotto/develop | 2017-10-27 | ||
|\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into develop | 2017-10-27 | ||
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||
* | | | | | | | | | Merge pull request #119 from koma-private/pr-translate-Japanese | 2017-10-27 | ||
|\ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into pr-translate-Japanese | 2017-10-27 | ||
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #114 from Guillerman/develop | 2017-10-27 | ||
|\ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into develop | 2017-10-27 | ||
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'develop' into develop | 2017-10-27 | ||
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | |