aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Small refactoring in who to follow pageHakaba Hitoyo2019-09-26
|
* Feature/Add _Allow user discovery services_ preferenceHakaba Hitoyo2019-09-26
|
* Merge branch 'hide-followers-follows-count' into 'develop'kaniini2019-09-26
|\ | | | | | | | | Added a setting to hide follow/follower count from the user profile See merge request pleroma/pleroma-fe!951
| * Added a setting to hide follow/follower count from the user profileeugenijm2019-09-23
| |
* | Merge remote-tracking branch 'upstream/develop' into emoji-selector-updateHenry Jameson2019-09-25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (42 commits) Fix formatting in oc.json avoid using global class fix logo moving bug when lightbox is open Reserve scrollbar gap when body scroll is locked setting display: initial makes trouble, instead, toggle display: none using classname lock body scroll add body-scroll-lock directive install body-scroll-lock wire up props with PostStatusModal rename component recover autofocusing behavior refactor MobilePostStatusModal using new PostStatusModal add new module and modal to post new status remove needless condition add mention button wire up user state with global store collapse fav/repeat notifications from muted users do not collapse thread muted posts in conversation detect thread-muted posts do not change word based muting logic ...
| * | Fix formatting in oc.jsonShpuld Shpuldson2019-09-25
| | |
| * | Merge branch '616' into 'develop'Shpuld Shpludson2019-09-25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Lock body scroll when lightbox is open Closes #616 See merge request pleroma/pleroma-fe!886
| | * | avoid using global classtaehoon2019-09-20
| | | |
| | * | fix logo moving bug when lightbox is opentaehoon2019-09-20
| | | |
| | * | Reserve scrollbar gap when body scroll is lockedtaehoon2019-09-20
| | | |
| | * | setting display: initial makes trouble, instead, toggle display: none using ↵taehoon2019-09-20
| | | | | | | | | | | | | | | | classname
| | * | lock body scrolltaehoon2019-09-20
| | | |
| | * | add body-scroll-lock directivetaehoon2019-09-20
| | | |
| * | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-09-25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [i18n] Update for the Occitan language file See merge request pleroma/pleroma-fe!901
| | * | | Update oc.jsonExilat2019-08-03
| | | | |
| | * | | Update for Interactions, new search, sticker picker, update copy.Exilat2019-08-03
| | | | |
| * | | | Merge branch 'es-translate' into 'develop'Shpuld Shpludson2019-09-25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [i18n] Update es translate See merge request pleroma/pleroma-fe!944
| | * | | | Update es translatetarteka2019-09-06
| | | | | |
| * | | | | Merge branch 'eu-translate' into 'develop'Shpuld Shpludson2019-09-25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [i18n] update eu translate See merge request pleroma/pleroma-fe!943
| | * | | | | fix some translatestarteka2019-09-10
| | | | | | |
| | * | | | | fix some translatestarteka2019-09-07
| | | | | | |
| | * | | | | fix some translatestarteka2019-09-07
| | | | | | |
| | * | | | | update eu translatetarteka2019-09-06
| | |/ / / /
| * | | | | Merge branch '639-2' into 'develop'Shpuld Shpludson2019-09-25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Mention user" button to user card Closes #639 See merge request pleroma/pleroma-fe!955
| | * | | | | wire up props with PostStatusModaltaehoon2019-09-20
| | | | | | |
| | * | | | | rename componenttaehoon2019-09-20
| | | | | | |
| | * | | | | recover autofocusing behaviortaehoon2019-09-20
| | | | | | |
| | * | | | | refactor MobilePostStatusModal using new PostStatusModaltaehoon2019-09-20
| | | | | | |
| | * | | | | add new module and modal to post new statustaehoon2019-09-20
| | | | | | |
| | * | | | | remove needless conditiontaehoon2019-09-20
| | | | | | |
| | * | | | | add mention buttontaehoon2019-09-20
| | | |_|/ / | | |/| | |
| * | | | | wire up user state with global storetaehoon2019-09-20
| | | | | |
| * | | | | collapse fav/repeat notifications from muted userstaehoon2019-09-20
| |/ / / /
| * | | | Merge branch 'develop' into 'muting-fixes'rinpatch2019-09-16
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | # Conflicts: # src/components/status/status.js
| | * | | do not collapse thread muted posts in conversationtaehoon2019-09-13
| | | | |
| | * | | detect thread-muted poststaehoon2019-09-13
| | | | |
| | * | | do not change word based muting logictaehoon2019-09-13
| | | | |
| | * | | do not collapse muted user's posts on muted user's media timelinetaehoon2019-09-13
| | | | |
| | * | | do not collapse muted user's posts on muted user's profile pagetaehoon2019-09-13
| | | | |
| | * | | Merge branch 'fix/italics-not-selectable' into 'develop'Shpuld Shpludson2019-09-13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix italics not being selectable See merge request pleroma/pleroma-fe!952
| | | * | | fix italics not being selectableShpuld Shpuldson2019-09-13
| | | | | |
| | * | | | Merge branch 'fix/follow-request-detection' into 'develop'Shpuld Shpludson2019-09-12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilize `user.requested` to display follow request status on user card Closes #635 See merge request pleroma/pleroma-fe!942
| | | * | | | Utilize `user.requested` to display follow request status on user cardrinpatch2019-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #635
| | * | | | | fix some translation about blocksdavidyin2019-09-11
| | | | | | |
| | * | | | | Complete the Chinese language file based on the version 0.9.999davidyin2019-09-10
| | | |/ / / | | |/| | |
| | * | | | Merge branch '651' into 'develop'Shpuld Shpludson2019-09-09
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Needless context api requests when click timeago in conversation page" Closes #651 See merge request pleroma/pleroma-fe!934
| | | * | | | update prop nametaehoon2019-09-06
| | | | | | |
| | | * | | | stop fetching whole conversation when change highlighted statustaehoon2019-09-06
| | | | | | |
| | | * | | | refactoringtaehoon2019-09-06
| | | | | | |
| | | * | | | update prop bindingtaehoon2019-09-06
| | | | | | |