aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'feat/conversation-muting' into 'develop'Shpuld Shpludson2019-08-08
|\ | | | | | | | | Add Conversation/Thread Muting See merge request pleroma/pleroma-fe!876
| * Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-26
| |\ | | | | | | | | | | | | # Conflicts: # src/components/extra_buttons/extra_buttons.js # src/components/extra_buttons/extra_buttons.vue
| * \ Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-15
| |\ \ | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| * | | Add thread muting to context menu of statusshpuld2019-07-07
| | | |
* | | | Merge branch 'issue-617' into 'develop'HJ2019-08-06
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle JSONified errors while registering Closes #617 See merge request pleroma/pleroma-fe!888
| * | | | Handle JSONified errors while registeringLee Starnes2019-08-06
|/ / / / | | | | | | | | | | | | Closes #617
* | | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update es.json (add sticker) See merge request pleroma/pleroma-fe!893
| * | | | Update es.json (add sticker)tarteka2019-07-24
| | |_|/ | |/| |
* | | | Merge branch '618' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to enlarge profile picture in profile page Closes #618 See merge request pleroma/pleroma-fe!890
| * | | | add zoom-in indication to avatartaehoon2019-07-28
| | | | |
| * | | | add zoom-in icontaehoon2019-07-28
| | | | |
| * | | | allow zooming avatar in profile panel headertaehoon2019-07-28
| | | | |
| * | | | use $route instead of $router.currentRoutetaehoon2019-07-28
| | | | |
| * | | | enlarge avatar in profile pagetaehoon2019-07-28
| | | | |
* | | | | Merge branch 'focus-on-search-input' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Focus on the search input when the search icon is clicked See merge request pleroma/pleroma-fe!896
| * | | | | Focus on the search input when the search icon is clickedEugenij2019-07-31
|/ / / / /
* | | | | Merge branch '626' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Prevent scrolling top when click search input Closes #626 See merge request pleroma/pleroma-fe!898
| * | | | prevent scrolling top when click search inputtaehoon2019-07-31
|/ / / /
* | | | Merge branch '549' into 'develop'HJ2019-07-28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Prevent showing pinned statuses twice Closes #549 See merge request pleroma/pleroma-fe!812
| * | | update unit testtaehoon2019-07-28
| | | |
| * | | rewrite unit teststaehoon2019-07-25
| | | |
| * | | add more unit tests for elimination logictaehoon2019-07-25
| | | |
| * | | add unit test for elimination logictaehoon2019-07-25
| | | |
| * | | use array.includes instead of array.indexOftaehoon2019-07-24
| | | |
| * | | update status eliminating logictaehoon2019-07-24
| | | |
| * | | fix typostaehoon2019-07-24
| | | |
| * | | update prop syntaxtaehoon2019-07-24
| | | |
| * | | put two loops in one parenttaehoon2019-07-24
| | | |
| * | | move pinned statuses showing logic in timelinetaehoon2019-07-24
| | | |
| * | | update prop nametaehoon2019-07-24
| | | |
| * | | prevent showing pinned statuses twicetaehoon2019-07-24
|/ / /
* | | Merge branch 'feature/add-sticker-picker' into 'develop'HJ2019-07-24
|\ \ \ | | | | | | | | | | | | | | | | Feature/add sticker picker See merge request pleroma/pleroma-fe!885
| * | | Feature/add sticker pickerabsturztaube2019-07-24
|/ / / | | | | | | | | | Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
* | | Merge branch '587' into 'develop'Shpuld Shpludson2019-07-24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Protect secure routes which require auth Closes #587 See merge request pleroma/pleroma-fe!892
| * | | guard more secure routestaehoon2019-07-24
| | | |
| * | | guard secure routes by redirecting to roottaehoon2019-07-24
|/ / /
* | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-07-24
|\ \ \ | | | | | | | | | | | | | | | | Update es.json See merge request pleroma/pleroma-fe!889
| * | | Update es.jsontarteka2019-07-23
| | | |
* | | | Merge branch '592' into 'develop'Shpuld Shpludson2019-07-24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Allow to click hyperlink inside markdown/html content Closes #592 See merge request pleroma/pleroma-fe!891
| * | | closest can returns itself as welltaehoon2019-07-23
| | | |
| * | | find inside status-content div onlytaehoon2019-07-23
| | | |
| * | | try to use the closest a tag as targettaehoon2019-07-23
|/ / /
* | | Merge branch 'fix/keyword-filter' into 'develop'kaniini2019-07-22
|\ \ \ | | | | | | | | | | | | | | | | Also apply keyword filter to subjects See merge request pleroma/pleroma-fe!887
| * | | Also apply keyword filter to subjectsToromino2019-07-20
|/ / /
* | | Remove files I accidentally pushed inshpuld2019-07-18
| | |
* | | fix issues caused by merges in usersearch on @shpuld2019-07-18
| | |
* | | Merge branch 'add-user-search-at' into 'develop'Shpuld Shpludson2019-07-18
|\ \ \ | | | | | | | | | | | | | | | | Add user search at See merge request pleroma/pleroma-fe!852
| * | | Add user search atWyatt Benno2019-07-18
|/ / /
* | | Merge branch '609' into 'develop'HJ2019-07-16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix popper issues using another popper library Closes #612 and #609 See merge request pleroma/pleroma-fe!881
| * | | fix eslint warningstaehoon2019-07-15
| | | |