aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |
| | * hide mute conversation button to gueststaehoon2019-08-20
| |/
| * Merge branch '640' into 'develop'Shpuld Shpludson2019-08-18
| |\ | | | | | | | | | | | | | | | | | | Fix "Mixed pin markers from multiple users" Closes #640 See merge request pleroma/pleroma-fe!919
| | * update keyBytaehoon2019-08-17
| | |
| | * generate idObj at timeline leveltaehoon2019-08-17
| | |
| | * fix pin showing logic in conversationtaehoon2019-08-17
| |/
| * Merge branch 'feature/noscript-message' into 'develop'Shpuld Shpludson2019-08-17
| |\ | | | | | | | | | | | | | | | | | | Show a message when JS is disabled Closes pleroma#827 See merge request pleroma/pleroma-fe!822
| | * Show a message when JS is disabledSergey Suprunenko2019-08-17
| |/
| * Merge branch 'fix/chat-issues' into 'develop'Shpuld Shpludson2019-08-17
| |\ | | | | | | | | | | | | | | | | | | Initialize chat only if user is logged in and it wasn't initialized before Closes pleroma#1067, pleroma#856, pleroma#1080, and #394 See merge request pleroma/pleroma-fe!894
| | * Initialize chat only if user is logged in and it wasn't initialized beforeSergey Suprunenko2019-08-17
| |/
| * Merge branch 'eu-translate' into 'develop'Shpuld Shpludson2019-08-17
| |\ | | | | | | | | | | | | add Basque translate See merge request pleroma/pleroma-fe!900
| | * add Basque translatetarteka2019-08-01
| | |
| * | Merge branch 'es-translate' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ | | | | | | | | | | | | | | | | [i18n] Spanish corrections See merge request pleroma/pleroma-fe!904
| | * | Corrections and semantics changes for Spanish translationtarteka2019-08-05
| | |/
| * | Merge branch 'update-nb' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ | | | | | | | | | | | | | | | | Update norwegian bokmål translation See merge request pleroma/pleroma-fe!906
| | * | Update norwegian bokmål translationmorguldir2019-08-08
| | | |
| * | | Merge branch 'i18n/update-japanese' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | i18n/Update Japanese See merge request pleroma/pleroma-fe!911
| | * | | i18n/Update JapaneseHakaba Hitoyo2019-08-17
| |/ / /
| * | | Merge branch 'i18n/update-pedantic-japanese' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | i18n/Update pedantic Japanese See merge request pleroma/pleroma-fe!912
| | * | | i18n/Update pedantic JapaneseHakaba Hitoyo2019-08-17
| |/ / /
| * | | Merge branch 'telugu-translation' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | i18n: Translated to Telugu (44.3%) See merge request pleroma/pleroma-fe!913
| | * | | i18n: Translated to Telugu (44.3%)Joseph Nuthalpati2019-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verified that the translation strings work by running Pleroma-FE locally. Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
| * | | | Merge branch '564' into 'develop'Shpuld Shpludson2019-08-17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore scroll position for user profile when navigate back and forward Closes #636 and #564 See merge request pleroma/pleroma-fe!914
| | * | | | sync profile tab state with location querytaehoon2019-08-15
| | | | | |
| | * | | | refactor TabSwitchertaehoon2019-08-15
| | | | | |
| | * | | | use better name of controlled proptaehoon2019-08-15
| | | | | |
| | * | | | fix potential bug to render active tab in controlled waytaehoon2019-08-15
| | | | | |
| | * | | | remove unused paramtaehoon2019-08-15
| | | | | |
| | * | | | use key prop instead of dataset to identify active tabtaehoon2019-08-15
| | | | | |
| | * | | | remove useless index param of onSwitchtaehoon2019-08-15
| | | | | |
| | * | | | reset error state when load new profiletaehoon2019-08-15
| | | | | |
| | * | | | clear timelines only if load user not viewed previouslytaehoon2019-08-15
| |/ / / /
| * | | | Merge branch 'fix/fix-link-to-external-users-in-who-to-follow-page' into ↵HJ2019-08-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'develop' Fix/Fix links to external users in Who to follow page See merge request pleroma/pleroma-fe!918
| | * | | | Fix/Fix links to external users in Who to follow pageHakaba Hitoyo2019-08-15
| |/ / / /
| * | | | Merge branch '293' into 'develop'Shpuld Shpludson2019-08-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect hashtag using rel instead of class Closes #293 See merge request pleroma/pleroma-fe!908
| | * | | | rel also accepts list, update rel detection logictaehoon2019-08-13
| | | | | |