aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into translation/zh-HantLibravatar Stefan Malzner2017-10-27
|\
| * Merge pull request #112 from haveneersrobin/masterLibravatar Stefan Malzner2017-10-27
| |\ | | | | | | Fixed spelling mistake and swapped word
| | * Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-26
| | |\ | | |/ | |/|
| | * Changed sentence to more commonly used expressionLibravatar Robin Haveneers2017-10-25
| | |
| | * Fixed spelling mistake and swapped wordLibravatar Robin Haveneers2017-10-25
| | |
* | | Merge branch 'develop' into translation/zh-HantLibravatar James Lin2017-10-27
|\| |
| * | Merge pull request #128 from DBozhinovski/masterLibravatar Stefan Malzner2017-10-26
| |\ \ | | | | | | | | Fixes #111
| | * | Fixes #111 on mainlineLibravatar Darko Bozhinovski2017-10-26
| | |/
| | * Merge pull request #108 from meetfranz/developLibravatar Stefan Malzner2017-10-25
| | |\ | | |/ | |/| Franz 5.0.0-beta.11
* / | [add] translation (zh-Hant)Libravatar ywjameslin2017-10-26
|/ /
* | Bump version to 5.0.0-beta.11v5.0.0-beta.11Libravatar Stefan Malzner2017-10-25
| |
* | Don't apply app.makeSingleInstance on macOSLibravatar Stefan Malzner2017-10-24
| |
* | Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2017-10-24
|\ \
| * \ Merge pull request #103 from cpeetersburg/masterLibravatar Stefan Malzner2017-10-24
| |\ \ | | | | | | | | updates to nl-BE locale based on Woordenlijst and Van Dale
| | * \ Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-24
| | |\ \ | | |/ / | |/| |
| | * | updates to nl-BE locale based on Woordenlijst and Van DaleLibravatar cpeetersburg2017-10-24
| | |/
* | | Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2017-10-24
|\| |
| * | Merge pull request #100 from meetfranz/feature/zoomin-aliasLibravatar Stefan Malzner2017-10-24
| |\ \ | | | | | | | | fix(Shortcut): Add ctrl+= alias for zoom in
| | * \ Merge branch 'develop' into feature/zoomin-aliasLibravatar Stefan Malzner2017-10-24
| | |\ \ | | |/ / | |/| |
| | * | fix(Shortcut): Add ctrl+= alias for zoom inLibravatar Stefan2017-10-24
| | | | | | | | | | | | | | | | Closes #54
* | | | add nl-BELibravatar Stefan Malzner2017-10-24
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #58 from Blizzke/nl-BELibravatar Stefan Malzner2017-10-22
| |\ \ \ | | | | | | | | | | [translation] Flemish (nl-BE)
| | * | | Couply minor typosLibravatar Steve Guns2017-10-22
| | | | |
| | * | | Removed nl-NL since someone already translated that and updated languages listLibravatar Steve Guns2017-10-22
| | | | |
| | * | | nl-BE and nl-NL translations addedLibravatar Steve Guns2017-10-22
| |/ / /
* | / / fix indentationLibravatar Stefan Malzner2017-10-24
| |/ / |/| |
* | | Merge pull request #99 from meetfranz/feature/win-multiple-tray-iconsLibravatar Stefan Malzner2017-10-24
|\ \ \ | |_|/ |/| | fix(Windows): Fix multiple system tray icons when opening/closing Franz
| * | fix(Windows): Fix multiple system tray icons when opening/closing FranzLibravatar Stefan2017-10-24
|/ /
* | Merge pull request #98 from meetfranz/feature/dev-mode-noticeLibravatar Stefan Malzner2017-10-24
|\ \ | | | | | | Add dev mode notice to login and signup
| * | Add API notice to users who run the app in dev modeLibravatar Stefan Malzner2017-10-24
| | |
| * | Add `warning` styles to infoboxLibravatar Stefan Malzner2017-10-24
|/ /
* | Merge pull request #94 from meetfranz/feature/recipe-managerLibravatar Stefan Malzner2017-10-24
|\ \ | | | | | | fix(Recipes): Fix recipe download when adding a new service
| * \ Merge branch 'develop' into feature/recipe-managerLibravatar Stefan Malzner2017-10-24
| |\ \ | |/ / |/| |
* | | Merge pull request #97 from meetfranz/feature/payment-urlLibravatar Stefan Malzner2017-10-24
|\ \ \ | | | | | | | | fix(Payment): Fix wrong URL encoding with special characters in parameters
| * \ \ Merge branch 'develop' into feature/payment-urlLibravatar Stefan Malzner2017-10-24
| |\ \ \ | |/ / / |/| | |
| * | | fix(Payment): Fix wrong URL encoding with umlauts in parametersLibravatar Stefan Malzner2017-10-24
| | | |
| | * | Merge branch 'develop' into feature/recipe-managerLibravatar Stefan Malzner2017-10-24
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #93 from ShiiFu/developLibravatar Stefan Malzner2017-10-24
|\ \ \ \ | |/ / / |/| | | Fix French translation
| * | | Fix French translationLibravatar Damien Leroy2017-10-24
|/ / /
| * | Fix recipe update loopLibravatar Stefan Malzner2017-10-24
| | |
| * | Improve recipe bulk downloadLibravatar Stefan Malzner2017-10-24
| | |
| * | replace tar.gz dependency (deprecated) with tarLibravatar Stefan2017-10-24
|/ /
* | Merge pull request #80 from apo-mak/developLibravatar Stefan Malzner2017-10-24
|\ \ | | | | | | [translation] Greek
| * | [translation] GreekLibravatar apo-mak2017-10-23
|/ /
* | Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2017-10-23
|\ \
| * \ Merge pull request #78 from meetfranz/feature/single-instance-windowLibravatar Stefan Malzner2017-10-23
| |\ \ | | | | | | | | fix(App): Force Franz to use single window
| | * \ Merge branch 'develop' into feature/single-instance-windowLibravatar Stefan Malzner2017-10-23
| | |\ \ | | |/ / | |/| |
| | * | fix(App): Force Franz to use single windowLibravatar Stefan Malzner2017-10-23
| | | | | | | | | | | | | | | | Fixes #29
* | | | update to electron 1.7.6Libravatar Stefan Malzner2017-10-23
| | | |
* | | | Change $ to € in subscription componentLibravatar Stefan Malzner2017-10-23
| | | |