Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fix merge conflict and add missing translation | 2017-10-27 | |
|\ | |||
| * | Merge branch 'develop' into master | 2017-10-27 | |
| |\ | |||
| | * | Merge branch 'develop' into orderingJumpFix | 2017-10-27 | |
| | |\ | |||
| | | * | Merge branch 'develop' into patch-1 | 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 branch 'develop' into develop | 2017-10-27 | |
| | | | |\ \ \ | |||
| | | | | * \ \ | Merge branch 'develop' into pr-translate-Japanese | 2017-10-27 | |
| | | | | |\ \ \ | |||
| | | | | | * \ \ | Merge branch 'develop' into develop | 2017-10-27 | |
| | | | | | |\ \ \ | |||
| | | | | | | * \ \ | Merge branch 'develop' into translation/zh-Hant | 2017-10-27 | |
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | | | | * | | Merge branch 'develop' into master | 2017-10-26 | |
| | | | | | | | |\ \ | |||
| | | | | | | | * | | | Changed sentence to more commonly used expression | 2017-10-25 | |
| | | | | | | | * | | | Fixed spelling mistake and swapped word | 2017-10-25 | |
| | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | | | * | | | Merge branch 'develop' into translation/zh-Hant | 2017-10-27 | |
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | | | * | | | [add] translation (zh-Hant) | 2017-10-26 | |
| | | | | | | | |/ | | | | | | | |/| | |||
| | | | | | * | | | Merge branch 'develop' into develop | 2017-10-26 | |
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | |||
| | | | | | * | | | [translation] Spanish | 2017-10-25 | |
| | | | | | | |/ | | | | | | |/| | |||
| | | | | * | | | Merge branch 'develop' into pr-translate-Japanese | 2017-10-26 | |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||
| | | | | * | | | Fix translation | 2017-10-25 | |
| | | | | | |/ | | | | | |/| | |||
| | | | * | | | Update TabBarSortableList.js | 2017-10-26 | |
| | | | * | | | Update en-US.json | 2017-10-26 | |
| | | | * | | | Added "sidebar.addservice" | 2017-10-26 | |
| | | | * | | | Fixes hover on "Add new service" not showing translation | 2017-10-26 | |
| | | | * | | | Added "enableSystemTray" line and minor fixes | 2017-10-25 | |
| | | | |/ / | |||
| | | * | | | [translation] Update Dutch (nl-NL) | 2017-10-27 | |
| | | * | | | Update translations | 2017-10-26 | |
| | | |/ / | |||
| | * | | | Merge branch 'develop' into orderingJumpFix | 2017-10-26 | |
| | |\ \ \ | | | | |/ | | | |/| | |||
| | * | | | Bugfix: When reordering make sure the new indexes are applied correctly | 2017-10-26 | |
| | | |/ | | |/| | |||
| * | | | Removes unused intl in tabbar; Adds nl translation for addNewService | 2017-10-27 | |
| * | | | Merge branch 'master' of github.com:meetfranz/franz | 2017-10-27 | |
| |\ \ \ | |||
| * | | | | Adds intl support for addNewService (sans translations) | 2017-10-27 | |
| | |_|/ | |/| | | |||
| * | | | Fixes #111 on mainline | 2017-10-26 | |
| | |/ | |/| | |||
* | | | [translation] Add norwegian translations | 2017-10-27 | |
| |/ |/| | |||
* | | Rename "Taskleiste" to "Systemleiste", Fix #138 | 2017-10-27 | |
|/ | |||
* | Don't apply app.makeSingleInstance on macOS | 2017-10-24 | |
* | Merge branch 'develop' of github.com:meetfranz/franz into develop | 2017-10-24 | |
|\ | |||
| * | Merge branch 'develop' into master | 2017-10-24 | |
| |\ | |||
| * | | updates to nl-BE locale based on Woordenlijst and Van Dale | 2017-10-24 | |
* | | | Merge branch 'develop' of github.com:meetfranz/franz into develop | 2017-10-24 | |
|\ \ \ | | |/ | |/| | |||
| * | | Merge branch 'develop' into feature/zoomin-alias | 2017-10-24 | |
| |\ \ | |||
| * | | | fix(Shortcut): Add ctrl+= alias for zoom in | 2017-10-24 | |
* | | | | add nl-BE | 2017-10-24 | |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | Couply minor typos | 2017-10-22 | |
| * | | | Removed nl-NL since someone already translated that and updated languages list | 2017-10-22 | |
| * | | | nl-BE and nl-NL translations added | 2017-10-22 | |
* | | | | fix indentation | 2017-10-24 | |
| |_|/ |/| | | |||
* | | | fix(Windows): Fix multiple system tray icons when opening/closing Franz | 2017-10-24 | |
| |/ |/| |