aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* update logonik2019-01-18
|
* Merge branch 'package-updates' into 'develop'lambda2019-01-18
|\ | | | | | | | | Upgrade packages See merge request pleroma/pleroma-fe!461
| * Upgrade packagesLambda2019-01-11
| |
* | Merge branch 'update-japanese-translation' into 'develop'lambda2019-01-18
|\ \ | | | | | | | | | | | | Update Japanese translation See merge request pleroma/pleroma-fe!465
| * | update japanese translationhakabahitoyo2019-01-16
|/ /
* | Merge branch 'feature/show-who-to-follow-in-mobile-view' into 'develop'HJ2019-01-16
|\ \ | | | | | | | | | | | | Show who to follow in the mobile view See merge request pleroma/pleroma-fe!452
| * | Show who to follow in the mobile viewHakaba Hitoyo2019-01-16
|/ /
* | Merge branch 'summary-html' into 'develop'lambda2019-01-15
|\ \ | | | | | | | | | | | | Sync with backend: Use summary_html. See merge request pleroma/pleroma-fe!463
| * | Sync with backend: Use summary_html.scarlett2019-01-13
| |/
* | Merge branch 'reply-detection' into 'develop'lambda2019-01-15
|\ \ | |/ |/| | | | | Remove reply detection hack See merge request pleroma/pleroma-fe!464
| * Remove reply detection hackscarlett2019-01-13
|/
* Merge branch 'translate-korean' into 'develop'Shpuld Shpludson2019-01-10
|\ | | | | | | | | Add Korean translation See merge request pleroma/pleroma-fe!457
| * Add Korean translationkjwon152019-01-10
|/
* Merge branch 'fix-265-fix-user-profiles-again' into 'develop'Shpuld Shpludson2019-01-09
|\ | | | | | | | | | | | | fixes #265 and also that thin line below gradient on chrome (UGH) Closes #265 See merge request pleroma/pleroma-fe!456
| * better fixHenry Jameson2019-01-09
| |
| * fixes #265 and also that thin line below gradient on chrome (UGH)Henry Jameson2019-01-09
| |
* | Merge branch 'fix/user-timeline-not-loading' into 'develop'Shpuld Shpludson2019-01-09
|\ \ | | | | | | | | | | | | | | | | | | Fix #262 user timelines bugging Closes #262 See merge request pleroma/pleroma-fe!454
| * | Change emptlyTl to take userIdshpuld2019-01-09
| | |
| * | Retain userId on clearing user timeline, don't flush when empty timelineshpuld2019-01-08
| | |
* | | Merge branch 'fix-262-load-older' into 'develop'Shpuld Shpludson2019-01-09
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | fix #262 part of user profiles not being able to load previous posts Closes #262 See merge request pleroma/pleroma-fe!455
| * | fix #262 part of user profiles not being able to load previous postsHenry Jameson2019-01-09
|/ /
* | Merge branch 'feature/add-about-page-for-mobile' into 'develop'Shpuld Shpludson2019-01-07
|\ \ | | | | | | | | | | | | Add instance information page for mobile See merge request pleroma/pleroma-fe!451
| * | Add instance information page for mobileHakaba Hitoyo2019-01-07
|/ /
* | Merge branch 'avoid-duplicates-in-who-to-follow-panel' into 'develop'HJ2019-01-04
|\ \ | | | | | | | | | | | | [Debug] Avoid duplicates in the who to follow panel See merge request pleroma/pleroma-fe!441
| * | [Debug] Avoid duplicates in the who to follow panelHakaba Hitoyo2019-01-04
|/ /
* | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-01-03
|\ \ | | | | | | | | | | | | updated German translation See merge request pleroma/pleroma-fe!449
| * | updated German translationVinzenz Vietzke2019-01-03
| |/ | | | | | | | | * added theme settings * added various missing single strings
* | Merge branch 'readme-update' into 'develop'Shpuld Shpludson2019-01-03
|\ \ | | | | | | | | | | | | Update README See merge request pleroma/pleroma-fe!446
| * | Update READMEFrancis Dinh2019-01-01
| |/ | | | | | | | | Mention that the Pleroma frontend is already included with the Pleroma backend. Also explicitly use `Pleroma-FE` when referring to the frontend.
* | Merge branch 'fix/captcha-string-typo' into 'develop'Shpuld Shpludson2019-01-03
|\ \ | |/ |/| | | | | | | | | Fix translation typo in registration.vue Closes #257 See merge request pleroma/pleroma-fe!448
| * Fix translation typo in registration.vuerinpatch2019-01-03
|/
* Merge branch 'feature/replace-panel-switcher' into 'develop'Shpuld Shpludson2018-12-31
|\ | | | | | | | | Mobile side drawer See merge request pleroma/pleroma-fe!443
| * Remove commented out back buttonshpuld2018-12-29
| |
| * merge develop, fix conflicts, fix logged out bugshpuld2018-12-29
| |\
| * | Cleanup and remove divider element in side drawershpuld2018-12-29
| | |
| * | fix conflict in user card contentshpuld2018-12-28
| |\ \
| * | | New routes, notifications, other impovements in side drwaershpuld2018-12-28
| | | |
| * | | Add closed-check for touchmoveshpuld2018-12-23
| | | |
| * | | move closing logic to drawer, add swipe to closeshpuld2018-12-23
| | | |
| * | | Merge branch 'develop' into feature/replace-panel-switchershpuld2018-12-22
| |\ \ \
| * | | | Add some more routes to side drawershpuld2018-12-22
| | | | |
| * | | | works but hackyshpuld2018-12-20
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into feature/replace-panel-switchershpuld2018-12-18
| |\ \ \ \ \
| * | | | | | Remove panel switcher, add rudimentary drawershpuld2018-12-15
| | | | | | |
* | | | | | | Merge branch 'fix/profile-with-no-statuses-not-loading' into 'develop'HJ2018-12-31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix profiles without statuses not loading See merge request pleroma/pleroma-fe!445
| * | | | | | | Fix profiles without statuses not loadingShpuld Shpludson2018-12-31
|/ / / / / / /
* | | | | | | Merge branch 'fix/conversation-headings-in-user-profile' into 'develop'HJ2018-12-31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflicting styles in conversation panels under user profile See merge request pleroma/pleroma-fe!444
| * | | | | | | Fix conflicting stylesshpuld2018-12-30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'scope-copy-default' into 'develop'HJ2018-12-30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | scopeCopy → true by default See merge request pleroma/pleroma-fe!439
| * | | | | | scopeCopy → true by defaultscarlett2018-12-25
| | | | | | |