summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'develop' into feature/recipe-managerLibravatar Stefan Malzner2017-10-24
|\
| * Merge pull request #97 from meetfranz/feature/payment-urlLibravatar Stefan Malzner2017-10-24
| |\
| | * 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 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] 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
| |\
| | * Merge branch 'develop' into feature/single-instance-windowLibravatar Stefan Malzner2017-10-23
| | |\ | | |/ | |/|
| | * fix(App): Force Franz to use single windowLibravatar Stefan Malzner2017-10-23
* | | update to electron 1.7.6Libravatar Stefan Malzner2017-10-23
* | | Change $ to € in subscription componentLibravatar Stefan Malzner2017-10-23
* | | Merge branch 'feature/autostart' into developLibravatar Stefan Malzner2017-10-23
|\ \ \ | |/ / |/| |
| * | Add missing windows commitLibravatar Stefan Malzner2017-10-23
| * | reset S3 deploy key for testing buildsLibravatar Stefan Malzner2017-10-23
| * | fix(Windows): Fix enable/disable autostart on loginLibravatar Stefan Malzner2017-10-23
| |/
* / disable auto-enable for auto start on macOSLibravatar Stefan Malzner2017-10-23
|/
* fix linting issueLibravatar Stefan Malzner2017-10-23
* Merge pull request #74 from Kietzmann/translation_UkrainianLibravatar Stefan Malzner2017-10-23
|\
| * Added Ukrainian TranslationLibravatar Dmytro Kytsmen2017-10-23
|/
* Merge pull request #69 from koma-private/developLibravatar Stefan Malzner2017-10-23
|\
| * Update languages.jsLibravatar Masanori KOMAGAMINE2017-10-23
| * Translation for JapaneseLibravatar Masanori KOMAGAMINE2017-10-23
|/
* Rename translations to match language keysLibravatar Stefan Malzner2017-10-23
* simplify language keysLibravatar Stefan Malzner2017-10-22
* Merge branch 'feature/macOS-darkmode-system-tray' into developLibravatar Stefan Malzner2017-10-22
|\
| * fix(System tray): Add macOS dark theme system tray iconLibravatar Stefan Malzner2017-10-19
* | Merge pull request #66 from meetfranz/feature/showUrlOnLinkHoverLibravatar Stefan Malzner2017-10-22
|\ \
| * \ Merge branch 'develop' into feature/showUrlOnLinkHoverLibravatar Stefan Malzner2017-10-22
| |\ \ | |/ / |/| |
* | | Merge pull request #65 from meetfranz/feature/service-importLibravatar Stefan Malzner2017-10-22
|\ \ \
| * | | fix(Onboarding): Fix service importLibravatar Stefan Malzner2017-10-22
| * | | fix(Onboarding): Fix enable/disable service import toggleLibravatar Stefan Malzner2017-10-22
* | | | Merge pull request #44 from phmigotto/developLibravatar Stefan Malzner2017-10-22
|\ \ \ \
| * \ \ \ Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-22
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #42 from mroeling/developLibravatar Stefan Malzner2017-10-22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-22
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-22
| |\ \ \ \ \
| * | | | | | Update translation file to reflect commentsLibravatar mroeling2017-10-21
| * | | | | | [translation] Nederlands/Dutch (nl-NL)Libravatar Mark Roeling2017-10-20
| | | * | | | Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-22
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #45 from rherwig/feature/translation-de-DELibravatar Stefan Malzner2017-10-22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into feature/translation-de-DELibravatar Stefan Malzner2017-10-22
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #46 from Shadorc/masterLibravatar Stefan Malzner2017-10-22
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-22
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |