aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* cleanup and appropriation for new emoji-input component API, styles updatesHenry Jameson2019-07-28
|
* rename emoji-selector to emoji-pickerHenry Jameson2019-07-28
|
* post-merge fixHenry Jameson2019-07-28
|
* Merge remote-tracking branch 'upstream/develop' into emoji-selector-updateHenry Jameson2019-07-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (469 commits) Feature/add sticker picker guard more secure routes guard secure routes by redirecting to root closest can returns itself as well find inside status-content div only try to use the closest a tag as target Update es.json Also apply keyword filter to subjects Remove files I accidentally pushed in fix issues caused by merges in usersearch on @ Add user search at fix eslint warnings remove vue-popperjs fix moderation menu partially hidden by usercard boundary migrate popper css rewrite ModerationTools using v-tooltip make popover position for status action dropdow relative to parent node rewrite ExtraButtons using v-tooltip install v-tooltip i18n/Update pedantic Japanese translation ...
| * 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
| | |
| | * remove vue-popperjstaehoon2019-07-15
| | |
| | * fix moderation menu partially hidden by usercard boundarytaehoon2019-07-15
| | |
| | * migrate popper csstaehoon2019-07-15
| | |
| | * rewrite ModerationTools using v-tooltiptaehoon2019-07-15
| | |
| | * make popover position for status action dropdow relative to parent nodetaehoon2019-07-15
| | |
| | * rewrite ExtraButtons using v-tooltiptaehoon2019-07-15
| | |
| | * install v-tooltiptaehoon2019-07-15
| |/
| * Merge branch 'fix/respect-hide-post-stats' into 'develop'HJ2019-07-15
| |\ | | | | | | | | | | | | Hide favs/rts properly when hide post stats is enabled See merge request pleroma/pleroma-fe!877
| | * Hide favs/rts properly when hide post stats is enabledshpuld2019-07-09
| | |
| * | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-07-15
| |\ \ | | | | | | | | | | | | | | | | Update es.json See merge request pleroma/pleroma-fe!794
| | * | Update es.jsontarteka2019-05-15
| | | |
| * | | Merge branch 'revert-0a7c60c3' into 'develop'Shpuld Shpludson2019-07-15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'csp-header' into 'develop'" See merge request pleroma/pleroma-fe!880
| | * | | Revert "Merge branch 'csp-header' into 'develop'"feld2019-07-10
| | | | | | | | | | | | | | | This reverts merge request !856
| * | | | Merge branch 'i18n/update-pedantic-japanese-traslation' into 'develop'Shpuld Shpludson2019-07-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i18n/Update pedantic Japanese translation See merge request pleroma/pleroma-fe!882
| | * | | | i18n/Update pedantic Japanese translationHakaba Hitoyo2019-07-15
| |/ / / /
| * | | | Merge branch 'i18n/update-japanese-trasnlation' into 'develop'Shpuld Shpludson2019-07-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i18n/Update easy Japanese trasnlation See merge request pleroma/pleroma-fe!878
| | * | | | i18n/Update easy Japanese trasnlationHakaba Hitoyo2019-07-15
| |/ / / /
| * | | | Merge branch 'new-search' into 'develop'Shpuld Shpludson2019-07-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | New search See merge request pleroma/pleroma-fe!832
| | * | | | New searchEugenij2019-07-15
| |/ / / /
| * | | | Merge branch '482-subscribe-user' into 'develop'HJ2019-07-15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Implement ability to subscribe to a user Closes #482 See merge request pleroma/pleroma-fe!771
| | * | | fix wrong eslint commentstaehoon2019-07-12
| | | | |
| | * | | add a todo commenttaehoon2019-07-12
| | | | |
| | * | | add bell-ringing icontaehoon2019-07-11
| | | | |
| | * | | eslint —fixtaehoon2019-07-10
| | | | |
| | * | | hide subscribe button unless followingtaehoon2019-07-10
| | | | |
| | * | | revert font changetaehoon2019-07-10
| | | | |
| | * | | use normal bell for unsubscribed statetaehoon2019-07-10
| | | | |