aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | | | |
* | | | | | | Merge branch 'restore-routes' into 'develop'lambda2018-12-29
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Restore old routes, enable user route as fallback. See merge request pleroma/pleroma-fe!440
| * | | | | | Treat reserved users like external users in the frontend.Lambda2018-12-26
| | | | | | |
| * | | | | | Restore old routes, enable user route as fallback.Lambda2018-12-25
| |/ / / / /
* | | | | | Merge branch 'feature/no-attachment-links' into 'develop'HJ2018-12-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No attachment links Closes #175 See merge request pleroma/pleroma-fe!442
| * | | | | | Add "noAttachmentLinks" to src/modules/instance.jsMaxim Filippov2018-12-27
| | | | | | |
| * | | | | | Make "noAttachmentLinks" configurableMaxim Filippov2018-12-27
| | | | | | |
| * | | | | | No attachment linksMaxim Filippov2018-12-27
|/ / / / / /
* | | | | | Merge branch 'improve_push' into 'develop'HJ2018-12-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve web push notifications Closes #231 See merge request pleroma/pleroma-fe!438
| * | | | | | improve web push notificationsEgor Kislitsyn2018-12-25
| |/ / / / /
* | | | | | Merge branch 'fix_notifications' into 'develop'Shpuld Shpludson2018-12-26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | User Card Content fixes and updates See merge request pleroma/pleroma-fe!437
| * | | | | User Card Content fixes and updatesHJ2018-12-26
|/ / / / /
* | | | | Merge branch 'push_fix' into 'develop'HJ2018-12-25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for push notifications Closes #235 See merge request pleroma/pleroma-fe!433
| * | | | | fixHenry Jameson2018-12-25
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/develop' into push_fixHenry Jameson2018-12-25
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Add a translation to the captcha strings in the registration form Small UI improvements for the CAPTCHA field Add encrypted captcha_answer_data for stateless captcha fixes many problems related to user profile
| * | | | | small refactor, added push unsub notice for BEHenry Jameson2018-12-25
| | | | | |
| * | | | | simplified some code, made it possible to unregister serviceworker altogetherHenry Jameson2018-12-20
| | | | | |
| * | | | | default webPush to false, because having it at true leads to some problems withHenry Jameson2018-12-20
| | | | | | | | | | | | | | | | | | | | | | | | local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
* | | | | | Merge branch 'update-japanese-translation' into 'develop'Shpuld Shpludson2018-12-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update japanese translation See merge request pleroma/pleroma-fe!435
| * | | | | | Update japanese translationHakaba Hitoyo2018-12-25
|/ / / / / /
* | | | | | Merge branch 'refactor-recommendations' into 'develop'HJ2018-12-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unneeded numbered variables who_to_follow See merge request pleroma/pleroma-fe!436
| * | | | | | fix inconsistencies within who_to_follow_panelHannah Ward2018-12-25
| | | | | | |