Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | | | | Merge branch 'develop' into orderingJumpFix | 2017-10-26 | ||
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||
* | | | | | | | | Merge pull request #128 from DBozhinovski/master | 2017-10-26 | ||
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Fixes #111 | |||
| | | * | | | | | 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 | ||
| |/ / / / | ||||
| | | * | | Merge branch 'master' into chore/travis-setup | 2017-10-25 | ||
| | | |\ \ | | |_|/ / | |/| | | | ||||
| | | * | | re-reset environment variables | 2017-10-18 | ||
| | | | | | | | | | | | | | | | | | | | | [appveyor skip] | |||
| | | * | | set linux dist to trusty | 2017-10-18 | ||
| | | | | | ||||
| | | * | | reset encrypted env vars | 2017-10-18 | ||
| | | | | | ||||
| | | * | | Merge branch 'master' into chore/travis-setup | 2017-10-18 | ||
| | | |\ \ | ||||
| | | * | | | Update vars | 2017-10-18 | ||
| | | | | | | ||||
| | | | | * | [translation] Add norwegian translations | 2017-10-27 | ||
| | | |_|/ | | |/| | | ||||
| | * | | | Merge pull request #142 from fechnert/fix_german_translation | 2017-10-27 | ||
| |/| | | | | | | | | | | | | | Rename "Taskleiste" to "Systemleiste", Fix #138 | |||
| | * | | | Rename "Taskleiste" to "Systemleiste", Fix #138 | 2017-10-27 | ||
| |/ / / | ||||
| * | | | Merge pull request #108 from meetfranz/develop | 2017-10-25 | ||
| |\ \ \ | |/ / / |/| | | | Franz 5.0.0-beta.11 | |||
* | | | | Bump version to 5.0.0-beta.11v5.0.0-beta.11 | 2017-10-25 | ||
| | | | | ||||
* | | | | Don't apply app.makeSingleInstance on macOS | 2017-10-24 | ||
| | | | | ||||
* | | | | Merge branch 'develop' of github.com:meetfranz/franz into develop | 2017-10-24 | ||
|\ \ \ \ | ||||
| * \ \ \ | Merge pull request #103 from cpeetersburg/master | 2017-10-24 | ||
| |\ \ \ \ | | | | | | | | | | | | | updates to nl-BE locale based on Woordenlijst and Van Dale | |||
| | * \ \ \ | 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 pull request #100 from meetfranz/feature/zoomin-alias | 2017-10-24 | ||
| |\ \ \ \ | | | | | | | | | | | | | fix(Shortcut): Add ctrl+= alias for zoom in | |||
| | * \ \ \ | Merge branch 'develop' into feature/zoomin-alias | 2017-10-24 | ||
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| | * | | | | fix(Shortcut): Add ctrl+= alias for zoom in | 2017-10-24 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #54 | |||
* | | | | | | add nl-BE | 2017-10-24 | ||
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||
| * | | | | | Merge pull request #58 from Blizzke/nl-BE | 2017-10-22 | ||
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | [translation] Flemish (nl-BE) | |||
| | * | | | | 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 | ||
| |/ / / |/| | | | ||||
* | | | | Merge pull request #99 from meetfranz/feature/win-multiple-tray-icons | 2017-10-24 | ||
|\ \ \ \ | |_|/ / |/| | | | fix(Windows): Fix multiple system tray icons when opening/closing Franz | |||
| * | | | fix(Windows): Fix multiple system tray icons when opening/closing Franz | 2017-10-24 | ||
|/ / / | ||||
* | | | Merge pull request #98 from meetfranz/feature/dev-mode-notice | 2017-10-24 | ||
|\ \ \ | | | | | | | | | Add dev mode notice to login and signup | |||
| * | | | Add API notice to users who run the app in dev mode | 2017-10-24 | ||
| | | | | ||||
| * | | | Add `warning` styles to infobox | 2017-10-24 | ||
|/ / / | ||||
* | | | Merge pull request #94 from meetfranz/feature/recipe-manager | 2017-10-24 | ||
|\ \ \ | | | | | | | | | fix(Recipes): Fix recipe download when adding a new service | |||
| * \ \ | Merge branch 'develop' into feature/recipe-manager | 2017-10-24 | ||
| |\ \ \ | |/ / / |/| | | | ||||
* | | | | Merge pull request #97 from meetfranz/feature/payment-url | 2017-10-24 | ||
|\ \ \ \ | | | | | | | | | | | fix(Payment): Fix wrong URL encoding with special characters in parameters | |||
| * \ \ \ | Merge branch 'develop' into feature/payment-url | 2017-10-24 | ||
| |\ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | fix(Payment): Fix wrong URL encoding with umlauts in parameters | 2017-10-24 | ||
| | | | | | ||||
| | * | | | Merge branch 'develop' into feature/recipe-manager | 2017-10-24 | ||
| | |\ \ \ | |_|/ / / |/| | | | | ||||
* | | | | | Merge pull request #93 from ShiiFu/develop | 2017-10-24 | ||
|\ \ \ \ \ | |/ / / / |/| | | | | Fix French translation | |||
| * | | | | Fix French translation | 2017-10-24 | ||
|/ / / / | ||||
| * | | | Fix recipe update loop | 2017-10-24 | ||
| | | | | ||||
| * | | | Improve recipe bulk download | 2017-10-24 | ||
| | | | | ||||
| * | | | replace tar.gz dependency (deprecated) with tar | 2017-10-24 | ||
|/ / / | ||||
* | | | Merge pull request #80 from apo-mak/develop | 2017-10-24 | ||
|\ \ \ | | | | | | | | | [translation] Greek |