aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-ma...Libravatar vantezzen2019-09-17
|\
| * fix(Todos): Highlight Franz Todos icon in sidebar when the Franz Todos panel ...Libravatar Stefan Malzner2019-09-17
* | Implement #41Libravatar vantezzen2019-09-17
* | Add information about donating to FranzLibravatar vantezzen2019-09-16
* | Fix merge errorsLibravatar vantezzen2019-09-13
* | Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-ma...Libravatar vantezzen2019-09-13
|\|
| * Merge branch 'develop' of https://github.com/meetfranz/franz into developLibravatar Stefan Malzner2019-09-12
| |\
| | * feat(Workspaces): Setting to keep all workspaces loadedLibravatar Dominik Guzei2019-09-11
| * | fix linting issuesLibravatar Stefan Malzner2019-09-12
| * | feat(Todos): Move todos toggle to sidebarLibravatar Stefan Malzner2019-09-11
| |/
* | Merge branch 'private-notifications'Libravatar vantezzen2019-09-11
|\ \
| * | Implement meetfranz/franz#879Libravatar vantezzen2019-09-08
* | | Fix missing Ferdi branding as suggested in #25Libravatar vantezzen2019-09-09
|/ /
* | Fix errors in 5.3.0 version mergeLibravatar vantezzen2019-09-07
* | Fix lintLibravatar vantezzen2019-09-07
* | Remove service restrictionLibravatar vantezzen2019-09-07
* | Make todo server editableLibravatar vantezzen2019-09-07
* | LintLibravatar vantezzen2019-09-07
* | Fix merge bugsLibravatar vantezzen2019-09-07
* | Remove analyticsLibravatar vantezzen2019-09-07
* | Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0Libravatar vantezzen2019-09-07
|\|
| * Merge branch 'master' into developLibravatar Stefan Malzner2019-09-07
| |\
| | * fix linting issuesLibravatar Stefan Malzner2019-09-07
| | * Make trial activation more obviousLibravatar Stefan Malzner2019-09-07
| * | feat(Todos): Add option to disable todosLibravatar Stefan Malzner2019-09-07
| |/
| * Merge branch 'develop' of https://github.com/meetfranz/franz into developLibravatar Stefan Malzner2019-09-06
| |\
| | * Remove news item on CTA clicksLibravatar Dominik Guzei2019-09-05
| * | Update 3rd party recipe wordingLibravatar Stefan Malzner2019-09-06
| |/
| * Fix headline spacingLibravatar Stefan Malzner2019-09-05
| * increase zindex to be in front of todosLibravatar Stefan Malzner2019-09-05
| * Fix isPro stateLibravatar Stefan Malzner2019-09-05
| * Fix linting issuesLibravatar Stefan Malzner2019-09-05
| * polishingLibravatar Stefan Malzner2019-09-05
| * bugfixing & polishingLibravatar Stefan Malzner2019-09-04
| * fix linting issuesLibravatar Stefan Malzner2019-09-03
| * Merge branch 'develop' into feature/new-pricingLibravatar Stefan Malzner2019-09-03
| |\
| | * Make todo layer resizableLibravatar Stefan Malzner2019-07-30
| | * Merge branch 'release/5.2.0' into feature/todosLibravatar Stefan Malzner2019-07-19
| | |\
| | * | basic integration of todos as static sidebarLibravatar Dominik Guzei2019-07-10
| * | | Add CTA for pro upgradeLibravatar Stefan Malzner2019-09-02
| * | | Remove user type from signupLibravatar Stefan Malzner2019-09-02
| * | | fix missing iconsLibravatar Stefan Malzner2019-08-28
| * | | Fix linting issuesLibravatar Stefan Malzner2019-08-28
| * | | Update wordingLibravatar Stefan Malzner2019-08-21
| * | | remove console logsLibravatar Stefan Malzner2019-08-19
| * | | Add trial / subscription handlingLibravatar Stefan Malzner2019-08-19
| * | | Add option to subscribe to trial via account dashboardLibravatar Stefan Malzner2019-08-08
| * | | WIP: add option to activate trialLibravatar Stefan Malzner2019-08-05
| * | | Add trial onboarding during signupLibravatar Stefan Malzner2019-07-04
| * | | Merge branch 'release/5.2.0-beta.4' into feature/new-pricingLibravatar Stefan Malzner2019-06-28
| |\ \ \ | | | |/ | | |/|