Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'develop' into feature/recipe-manager | Stefan Malzner | 2017-10-24 |
|\ | |||
| * | Merge pull request #97 from meetfranz/feature/payment-url | Stefan Malzner | 2017-10-24 |
| |\ | | | | | | | fix(Payment): Fix wrong URL encoding with special characters in parameters | ||
| | * | Merge branch 'develop' into feature/payment-url | Stefan Malzner | 2017-10-24 |
| | |\ | | |/ | |/| | |||
| | * | fix(Payment): Fix wrong URL encoding with umlauts in parameters | Stefan Malzner | 2017-10-24 |
| | | | |||
* | | | Merge branch 'develop' into feature/recipe-manager | Stefan Malzner | 2017-10-24 |
|\| | | |||
| * | | Merge pull request #93 from ShiiFu/develop | Stefan Malzner | 2017-10-24 |
| |\ \ | | |/ | |/| | Fix French translation | ||
| | * | Fix French translation | Damien Leroy | 2017-10-24 |
| |/ | |||
* | | Fix recipe update loop | Stefan Malzner | 2017-10-24 |
| | | |||
* | | Improve recipe bulk download | Stefan Malzner | 2017-10-24 |
| | | |||
* | | replace tar.gz dependency (deprecated) with tar | Stefan | 2017-10-24 |
|/ | |||
* | Merge pull request #80 from apo-mak/develop | Stefan Malzner | 2017-10-24 |
|\ | | | | | [translation] Greek | ||
| * | [translation] Greek | apo-mak | 2017-10-23 |
|/ | |||
* | Merge branch 'develop' of github.com:meetfranz/franz into develop | Stefan Malzner | 2017-10-23 |
|\ | |||
| * | Merge pull request #78 from meetfranz/feature/single-instance-window | Stefan Malzner | 2017-10-23 |
| |\ | | | | | | | fix(App): Force Franz to use single window | ||
| | * | Merge branch 'develop' into feature/single-instance-window | Stefan Malzner | 2017-10-23 |
| | |\ | | |/ | |/| | |||
| | * | fix(App): Force Franz to use single window | Stefan Malzner | 2017-10-23 |
| | | | | | | | | | | | | Fixes #29 | ||
* | | | update to electron 1.7.6 | Stefan Malzner | 2017-10-23 |
| | | | |||
* | | | Change $ to € in subscription component | Stefan Malzner | 2017-10-23 |
| | | | |||
* | | | Merge branch 'feature/autostart' into develop | Stefan Malzner | 2017-10-23 |
|\ \ \ | |/ / |/| | | |||
| * | | Add missing windows commit | Stefan Malzner | 2017-10-23 |
| | | | |||
| * | | reset S3 deploy key for testing builds | Stefan Malzner | 2017-10-23 |
| | | | |||
| * | | fix(Windows): Fix enable/disable autostart on login | Stefan Malzner | 2017-10-23 |
| |/ | | | | | | | Fixes #17 | ||
* / | disable auto-enable for auto start on macOS | Stefan Malzner | 2017-10-23 |
|/ | |||
* | fix linting issue | Stefan Malzner | 2017-10-23 |
| | |||
* | Merge pull request #74 from Kietzmann/translation_Ukrainian | Stefan Malzner | 2017-10-23 |
|\ | | | | | [translation] Ukrainian | ||
| * | Added Ukrainian Translation | Dmytro Kytsmen | 2017-10-23 |
|/ | |||
* | Merge pull request #69 from koma-private/develop | Stefan Malzner | 2017-10-23 |
|\ | | | | | [translation] Japanese (ja) | ||
| * | Update languages.js | Masanori KOMAGAMINE | 2017-10-23 |
| | | |||
| * | Translation for Japanese | Masanori KOMAGAMINE | 2017-10-23 |
|/ | |||
* | Rename translations to match language keys | Stefan Malzner | 2017-10-23 |
| | |||
* | simplify language keys | Stefan Malzner | 2017-10-22 |
| | |||
* | Merge branch 'feature/macOS-darkmode-system-tray' into develop | Stefan Malzner | 2017-10-22 |
|\ | |||
| * | fix(System tray): Add macOS dark theme system tray icon | Stefan Malzner | 2017-10-19 |
| | | | | | | | | Fixes #1 | ||
* | | Merge pull request #66 from meetfranz/feature/showUrlOnLinkHover | Stefan Malzner | 2017-10-22 |
|\ \ | | | | | | | Feature/show url on link hover | ||
| * \ | Merge branch 'develop' into feature/showUrlOnLinkHover | Stefan Malzner | 2017-10-22 |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #65 from meetfranz/feature/service-import | Stefan Malzner | 2017-10-22 |
|\ \ \ | | | | | | | | | Fix service import | ||
| * | | | fix(Onboarding): Fix service import | Stefan Malzner | 2017-10-22 |
| | | | | | | | | | | | | | | | | Fixes #22 | ||
| * | | | fix(Onboarding): Fix enable/disable service import toggle | Stefan Malzner | 2017-10-22 |
| | | | | |||
* | | | | Merge pull request #44 from phmigotto/develop | Stefan Malzner | 2017-10-22 |
|\ \ \ \ | | | | | | | | | | | [translation] Brazilian Portuguese (pt-BR) | ||
| * \ \ \ | Merge branch 'develop' into develop | Stefan Malzner | 2017-10-22 |
| |\ \ \ \ | |/ / / / |/| | | | | |||
* | | | | | Merge pull request #42 from mroeling/develop | Stefan Malzner | 2017-10-22 |
|\ \ \ \ \ | | | | | | | | | | | | | [translation] Nederlands/Dutch (nl-NL) | ||
| * \ \ \ \ | Merge branch 'develop' into develop | Stefan Malzner | 2017-10-22 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Merge branch 'develop' into develop | Stefan Malzner | 2017-10-22 |
| |\ \ \ \ \ | |||
| * | | | | | | Update translation file to reflect comments | mroeling | 2017-10-21 |
| | | | | | | | | | | | | | | | | | | | | | In dutch the word service has a different meaning than in English, less usefull as a plural word. That's why I choose to use modules instead. However, the preffered word by the reviewe still is services, so that's why it is changed back to services. | ||
| * | | | | | | [translation] Nederlands/Dutch (nl-NL) | Mark Roeling | 2017-10-20 |
| | | | | | | | |||
| | | * | | | | Merge branch 'develop' into develop | Stefan Malzner | 2017-10-22 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #45 from rherwig/feature/translation-de-DE | Stefan Malzner | 2017-10-22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [translation] German (de-DE) | ||
| * \ \ \ \ \ \ | Merge branch 'develop' into feature/translation-de-DE | Stefan Malzner | 2017-10-22 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #46 from Shadorc/master | Stefan Malzner | 2017-10-22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [translation] French (fr) | ||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into master | Stefan Malzner | 2017-10-22 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |