aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* 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
| | | | | |
| | * | | | accept status id instead of status obj as statusoid proptaehoon2019-09-06
| | | |/ / | | |/| |
| * / | | refactor toggling body visibility using classtaehoon2019-09-06
| |/ / /
| * | | Merge branch 'mastoapi-externalprofile' into 'develop'Shpuld Shpludson2019-09-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Replace `/api/externalprofile/show.json` with a MastoAPI equialent See merge request pleroma/pleroma-fe!938
| | * | | Replace `/api/externalprofile/show.json` with a MastoAPI equialentrinpatch2019-09-03
| | | | | | | | | | | | | | | | | | | | `/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
| * | | | Password reset pageEugenij2019-09-05
| | |/ / | |/| |
| * | | add a commenttaehoon2019-09-04
| | | |
| * | | force img updating immediatelytaehoon2019-09-04
| | | |
* | | | Avoid iterating over statuses to set thread_muted if the backend doesrinpatch2019-09-04
| | | | | | | | | | | | | | | | not support the extension
* | | | Set thread_muted for all statuses with the same conversation id onrinpatch2019-09-04
| | | | | | | | | | | | | | | | status mute/unmute
* | | | Properly detect thread-muted posts and set `with_muted` when fetchingrinpatch2019-09-04
|/ / / | | | | | | | | | notifications
* / / Fixed "sequimiento" to "seguimiento".Echedey López Romero2019-09-03
|/ /
* | Use mastodon api in follow requestsrinpatch2019-09-03
| |
* | Merge branch '652' into 'develop'Shpuld Shpludson2019-09-03
|\ \ | | | | | | | | | | | | | | | | | | Fix "TypeError: Cannot set property 'pinned' of undefined" Closes #652 See merge request pleroma/pleroma-fe!936