aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | |
| * | | remove unneeded numbered variables who_to_followHannah Ward2018-12-25
| | |/ | |/|
* | | Merge branch 'fix_textfields' into 'develop'HJ2018-12-25
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix textarea not resizing correctly and probably cursor position Closes #230 See merge request pleroma/pleroma-fe!430
| * | fix for non-shrinking main post formHenry Jameson2018-12-25
| | |
| * | fixed incorrect height when empty textHenry Jameson2018-12-20
| | |
| * | I suppose SOME browsers don't do this by default...Henry Jameson2018-12-20
| | |
| * | Fix resize not working properly for textareasHenry Jameson2018-12-20
| | |
* | | Merge branch 'captcha' into 'develop'Shpuld Shpludson2018-12-22
|\ \ \ | | | | | | | | | | | | | | | | Make captcha stateless See merge request pleroma/pleroma-fe!434
| * | | Add a translation to the captcha strings in the registration formEkaterina Vaartis2018-12-21
| | | |
| * | | Small UI improvements for the CAPTCHA fieldEkaterina Vaartis2018-12-21
| | | |
| * | | Add encrypted captcha_answer_data for stateless captchaEkaterina Vaartis2018-12-21
|/ / /
* | | Merge branch 'fix_followers' into 'develop'Shpuld Shpludson2018-12-20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | fixes many problems related to user profile Closes #239 See merge request pleroma/pleroma-fe!432
| * | fixes many problems related to user profileHenry Jameson2018-12-20
|/ /
* | Merge branch 'remove_favorite_hacks' into 'develop'HJ2018-12-19
|\ \ | | | | | | | | | | | | | | | | | | no more "broken favorite" Closes #218 and #145 See merge request pleroma/pleroma-fe!431
| * | no more "broken favorite"Henry Jameson2018-12-19
| | |
* | | Merge branch 'fix_defaults' into 'develop'Shpuld Shpludson2018-12-19
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fixed some settings not using defaults from instance config. Closes #228 See merge request pleroma/pleroma-fe!429
| * | Fixed some settings not using defaults from instance config. Made some parts ofHenry Jameson2018-12-18
| |/ | | | | | | code more readable
* | Merge branch 'user-profile-overhault' into 'develop'HJ2018-12-18
|\ \ | |/ |/| | | | | | | | | Small refactor for followers/friends, change display to use tabs instead of "leaky brains" Closes #111 See merge request pleroma/pleroma-fe!427
| * Merge remote-tracking branch 'upstream/develop' into user-profile-overhaultHenry Jameson2018-12-18
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (24 commits) Feature/bigger icons for mobile / #211 Fix oauth url Make user profile page cleaner Redirect to /main/all Move userProfile link to methods Fix user profile test Add temporary redirects Add local profile test Implement user_profile.spec.js Use babel polyfill in karma Use 'userProfileLink' to generate user-profile link Rollback disableDotRule Use "-1" in indexOf Add generateProfileLink Use "~" as a route namespace symbol Disable dot rule Pass userName instead of userId Typo in tests Fix redirect paths Fix typo ...
* | Merge branch 'feature/bigger-icons-for-mobile' into 'develop'Shpuld Shpludson2018-12-18
|\ \ | | | | | | | | | | | | Feature/bigger icons for mobile / #211 See merge request pleroma/pleroma-fe!423
| * | Feature/bigger icons for mobile / #211Shpuld Shpludson2018-12-18
|/ /
* | Merge branch 'feature/new-user-routes' into 'develop'lambda2018-12-18
|\ \ | | | | | | | | | | | | | | | | | | Make domain.com/username routes work Closes pleroma#395 See merge request pleroma/pleroma-fe!392
| * | Fix oauth urlMaxim Filippov2018-12-17
| | |
| * | Redirect to /main/allMaxim Filippov2018-12-17
| | |