aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* filter out blocked user or me from the resultstaehoon2019-04-14
|
* make blocking functional in the search resultstaehoon2019-04-14
|
* improve uitaehoon2019-04-14
|
* hide results on outside clicktaehoon2019-04-14
|
* remove needless dependencytaehoon2019-04-14
|
* rename css classestaehoon2019-04-14
|
* rewrite USerAutoSuggest without any dependencytaehoon2019-04-14
|
* add user autosuggest componenttaehoon2019-04-14
|
* setup vue-autosuggesttaehoon2019-04-14
|
* Merge branch 'issues/pleroma-fe-496-following-follower-error' into 'develop'Shpuld Shpludson2019-04-14
|\ | | | | | | | | | | | | Fix error message on no more data fetched Closes #496 See merge request pleroma/pleroma-fe!756
| * display no message on empty data fetched from apiBrenden Bice2019-04-12
| |
| * remove error message on no more followingBrenden Bice2019-04-12
|/
* Merge branch 'fix-notif-user' into 'develop'HJ2019-04-12
|\ | | | | | | | | | | | | Fix wrong usercard notification Closes #493 See merge request pleroma/pleroma-fe!755
| * Fix wrong usercard notificationHenry Jameson2019-04-12
|/
* Merge branch '480-replies' into 'develop'HJ2019-04-11
|\ | | | | | | | | | | | | Display replies to statuses in real time Closes #480 See merge request pleroma/pleroma-fe!737
| * maintain conversationsObject storagetaehoon2019-04-11
| |
| * remove unused importingtaehoon2019-04-11
| |
| * get statuses in a conversation from the global repository instead of local statetaehoon2019-04-11
|/
* Merge branch 'restore-yarnlock' into 'develop'HJ2019-04-10
|\ | | | | | | | | restore yarnlock See merge request pleroma/pleroma-fe!749
| * restore yarnlockHenry Jameson2019-04-10
|/
* Merge branch 'issue-436-mastoapi-notifications' into 'develop'HJ2019-04-10
|\ | | | | | | | | | | | | #436: integrate mastoAPI notifications Closes #436 See merge request pleroma/pleroma-fe!678
| * #436 - remove yarn.lockdave2019-04-10
| |
| * #436 - merge developdave2019-04-10
| |\ | |/ |/|
* | Merge branch 'fix-local' into 'develop'HJ2019-04-10
|\ \ | | | | | | | | | | | | Fix wrong property read in pleroma object See merge request pleroma/pleroma-fe!747
| * | Fix wrong localHenry Jameson2019-04-10
|/ /
* | Merge branch 'mastoapi/update-extension-support' into 'develop'Shpuld Shpludson2019-04-10
|\ \ | | | | | | | | | | | | Update entity normalizer to include more pleroma-specific fields See merge request pleroma/pleroma-fe!745
| * | revert, it's still missingHenry Jameson2019-04-09
| | |
| * | add support for pleroma-specific fieldsHenry Jameson2019-04-09
| | |
* | | Merge branch 'fix-emoji-picker' into 'develop'Shpuld Shpludson2019-04-10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | support new custom emoji format Closes #484 See merge request pleroma/pleroma-fe!746
| * | support new custom emoji formatHenry Jameson2019-04-09
|/ /
| * Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-09
| |\ | |/ |/| | | issue-436-mastoapi-notifications
* | Merge branch '486-expand-button' into 'develop'Shpuld Shpludson2019-04-09
|\ \ | | | | | | | | | | | | | | | | | | #486 - remove expand button on conversation page Closes #486 See merge request pleroma/pleroma-fe!742
| * | #486 - remove expand button on conversation pagejared2019-04-09
| | |
* | | Merge branch 'fix/prevent-repeated-fetching' into 'develop'Shpuld Shpludson2019-04-09
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #485 Prevent repeated fetching Closes #485 See merge request pleroma/pleroma-fe!738
| * | | fix small bugjasper2019-04-09
| | | |
| * | | Add await to login befor redirect to friends timelinejasper2019-04-09
| | | |
| * | | Prevent repeated fetchingjasper2019-04-09
| | | |
* | | | Merge branch 'fix/notification-bugs' into 'develop'Shpuld Shpludson2019-04-09
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | #474 Fix notification bugs Closes #474 See merge request pleroma/pleroma-fe!728
| * | | Add spacejasper2019-04-04
| | | |
| * | | Separate timeline and notificationjasper2019-04-04
| | | |
| * | | Remove useless codesjasper2019-04-03
| | | |
| * | | Fix notification bugsjasper2019-04-03
| | | |
| | | * #436 - merge developdave2019-04-08
| | | |\ | |_|_|/ |/| | |
* | | | Merge branch 'moderation-menu' into 'develop'Shpuld Shpludson2019-04-08
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Moderation menu #310 See merge request pleroma/pleroma-fe!595
| * | | | Added moderation menueugenijm2019-04-01
| |/ / /
| | | * Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-08
| | | |\ | |_|_|/ |/| | | | | | | issue-436-mastoapi-notifications
* | | | Merge branch 'debug_message' into 'develop'Shpuld Shpludson2019-04-08
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | remove debug message See merge request pleroma/pleroma-fe!735
| * | | remove debug messageMaksim2019-04-08
|/ / /
* | | Merge branch 'issue-469-safe-dm-from-BE' into 'develop'Shpuld Shpludson2019-04-04
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Issue 469 safe dm from be Closes #469 See merge request pleroma/pleroma-fe!726
| * | #469 - update text copydave2019-04-02
| | |