aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |
* | Merge branch '648-2' into 'develop'Shpuld Shpludson2019-09-09
|\ \ | |/ |/| | | | | | | | | Fix wrong body css while toggling visibility Closes #648 See merge request pleroma/pleroma-fe!930
| * 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
* | Merge branch 'password-reset' into 'develop'Shpuld Shpludson2019-09-05
|\ \ | | | | | | | | | | | | | | | | | | Password reset page Closes #213 See merge request pleroma/pleroma-fe!884
| * | Password reset pageEugenij2019-09-05
|/ /
* | Merge branch '655' into 'develop'HJ2019-09-04
|\ \ | | | | | | | | | | | | | | | | | | Fix "User avatar not updating immediately when switching user profile" Closes #655 See merge request pleroma/pleroma-fe!940
| * | add a commenttaehoon2019-09-04
| | |
| * | force img updating immediatelytaehoon2019-09-04
|/ /
* | Merge branch 'patch-2' into 'develop'HJ2019-09-03
|\ \ | |/ |/| | | | | Fixed "sequimiento" to "seguimiento". Spanish translation. See merge request pleroma/pleroma-fe!939
| * Fixed "sequimiento" to "seguimiento".Echedey López Romero2019-09-03
|/
* Merge branch 'mastoapi-follow-reqs' into 'develop'HJ2019-09-03
|\ | | | | | | | | Use mastodon api in follow requests See merge request pleroma/pleroma-fe!937
| * 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
| * fix pin/unpin status logictaehoon2019-09-01
| |
| * rename a mutationtaehoon2019-09-01
| |
* | Merge branch 'patch-1' into 'develop'Shpuld Shpludson2019-09-03
|\ \ | | | | | | | | | | | | Some corrections to the spanish translation See merge request pleroma/pleroma-fe!929
| * | "Optional" in lowercase.Echedey López Romero2019-09-02
| | |
| * | Update es.jsonEchedey López Romero2019-09-01
| | |
| * | Corrected "Media Proxy" translation.Echedey López Romero2019-08-27
| | |
| * | Update es.jsonEchedey López Romero2019-08-26
| | |
* | | Merge branch 'fix/attachment-css' into 'develop'Shpuld Shpludson2019-09-03
|\ \ \ | |_|/ |/| | | | | | | | Make image orientation consistent on FF, fix videos w/ modal See merge request pleroma/pleroma-fe!926
| * | Make image orientation consistent on FF, fix videos w/ modalShpuld Shpuldson2019-08-26
| | |
* | | Merge branch 'docs' into 'develop'HJ2019-08-31
|\ \ \ | | | | | | | | | | | | | | | | Documentation See merge request pleroma/pleroma-fe!718
| * \ \ Merge remote-tracking branch 'upstream/docs' into docsHenry Jameson2019-08-31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/docs: Apply suggestion to docs/HACKING.md Apply suggestion to docs/CONFIGURATION.md
| | * | | Apply suggestion to docs/HACKING.mdHJ2019-08-01
| | | | |
| | * | | Apply suggestion to docs/CONFIGURATION.mdHJ2019-06-28
| | | | |
| * | | | updateHenry Jameson2019-08-31
| | | | |
| * | | | Merge remote-tracking branch 'upstream/develop' into docsHenry Jameson2019-08-31
| |\ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (193 commits) fix user avatar fallback logic remove dead code make bio textarea resizable vertically only remove dead code remove dead code fix crazy watch logic in conversation show three dot button only if needed hide mute conversation button to guests update keyBy generate idObj at timeline level fix pin showing logic in conversation Show a message when JS is disabled Initialize chat only if user is logged in and it wasn't initialized before i18n/Update Japanese i18n/Update pedantic Japanese sync profile tab state with location query refactor TabSwitcher use better name of controlled prop fix potential bug to render active tab in controlled way remove unused param ...
* | | | Merge branch 'remove-dead-code' into 'develop'Shpuld Shpludson2019-08-29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove dead code See merge request pleroma/pleroma-fe!927
| * | | | remove dead codetaehoon2019-08-28
| | |_|/ | |/| |
* | | | Merge branch 'fix-user-avatar-fallback' into 'develop'Shpuld Shpludson2019-08-29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix broken user avatar fallback logic See merge request pleroma/pleroma-fe!933
| * | | fix user avatar fallback logictaehoon2019-08-28
|/ / /
* | | Merge branch '650' into 'develop'HJ2019-08-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make bio textarea resizable vertically only Closes #650 See merge request pleroma/pleroma-fe!928
| * | | make bio textarea resizable vertically onlytaehoon2019-08-26
|/ / /
* | | Merge branch 'remove-dead-code' into 'develop'HJ2019-08-26
|\ \ \ | |_|/ |/| | | | | | | | Remove dead code See merge request pleroma/pleroma-fe!925
| * | remove dead codetaehoon2019-08-26
| | |
| * | remove dead codetaehoon2019-08-25
|/ /
* | Merge branch '646' into 'develop'Shpuld Shpludson2019-08-25
|\ \ | | | | | | | | | | | | | | | | | | Fix "Making hundreds of needless api requests in profile page" Closes #646 See merge request pleroma/pleroma-fe!923
| * | fix crazy watch logic in conversationtaehoon2019-08-23
|/ /
* | Merge branch '645' into 'develop'Shpuld Shpludson2019-08-21
|\ \ | | | | | | | | | | | | | | | | | | Show "Mute Conversation" menu item and three dot button to users and only if needed Closes #645 See merge request pleroma/pleroma-fe!922
| * | show three dot button only if neededtaehoon2019-08-20
| | |