aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix fixed background issuetaehoon2019-02-03
|
* Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into ↵Shpuld Shpludson2019-02-03
|\ | | | | | | | | | | | | 'develop' #306 - fix conversation arrow smushed in notifications panel See merge request pleroma/pleroma-fe!513
| * #306 - fix conversation arrow smushed in notifications panelXiaofeng An2019-02-03
| |
| * Revert "#306 - fix conversation arrow smushed in notifications panel"Xiaofeng An2019-02-03
| | | | | | | | This reverts commit 1e40e70efc64071581adff4bce3c8bf78da82acb.
| * #306 - fix conversation arrow smushed in notifications panelXiaofeng An2019-02-02
| |
* | Merge branch 'revert-886aa35e' into 'develop'Shpuld Shpludson2019-02-03
|\ \ | | | | | | | | | | | | Revert "Merge branch 'feature/split-hide-network' into 'develop'" See merge request pleroma/pleroma-fe!514
| * | Revert "Merge branch 'feature/split-hide-network' into 'develop'"Shpuld Shpludson2019-02-03
|/ / | | | | This reverts merge request !497
* | Merge branch '238-add-avatar-size-suggestion' into 'develop'Shpuld Shpludson2019-02-03
|\ \ | | | | | | | | | | | | | | | | | | Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
| * | Add avatar size instruction noticetaehoon2019-02-02
| | |
* | | Merge branch 'fix/default-inlined-videos' into 'develop'Shpuld Shpludson2019-02-03
|\ \ \ | |/ / |/| | | | | | | | Change video playing default without bothering making it an instance configurable See merge request pleroma/pleroma-fe!505
| * | Change video playing default without bothering making it an instance ↵shpuld2019-01-31
| | | | | | | | | | | | configurable
* | | Merge branch 'fix-max-id-for-notifications' into 'develop'HJ2019-02-02
|\ \ \ | | | | | | | | | | | | | | | | Fix incorrect latest_id value in notifications_read request See merge request pleroma/pleroma-fe!509
| * | | Use integer type of notitication ids (avoid redundant casting for getting ↵eugenijm2019-02-02
| | | | | | | | | | | | | | | | maxId in addNewNotifications)
| * | | Explicitly cast notification ids to integers when using them for setting maxIdeugenijm2019-02-02
| |/ / | | | | | | | | | | | | This fixes the bug where BE receives incorrect `since_id` when marking notifications as read.
* | | Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into ↵Shpuld Shpludson2019-02-02
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'develop' fix #157 show screen_name when name is empty in retweet Closes #157 See merge request pleroma/pleroma-fe!508
| * | fix #157 show screen_name when name is empty in retweetJoshua Burch2019-02-01
| | |
* | | Merge branch 'fix/name-field-length-should-be-as-wide-as-the-bio-field' into ↵feld2019-02-01
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'develop' fix #209 make name field length as wide as the bio field Closes #209 See merge request pleroma/pleroma-fe!507
| * | fix #209 make name field length as wide as the bio fieldJoshua Burch2019-02-01
|/ /
* | Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'Shpuld Shpludson2019-01-31
|\ \ | | | | | | | | | | | | | | | | | | Fix #298 Add option to tab switcher to not render background tabs Closes #298 See merge request pleroma/pleroma-fe!504
| * | Fix media timeline attachments being small by adding an option to not render ↵shpuld2019-01-31
| |/ | | | | | | background tabs in tab switcher
* | Merge branch 'fix/statistics' into 'develop'Shpuld Shpludson2019-01-31
|\ \ | | | | | | | | | | | | Fix statistics label visibility via configuration See merge request pleroma/pleroma-fe!503
| * | Fix statistics label visibility via configurationEdijs2019-01-30
| |/
* | Merge branch 'patch-1' into 'develop'Shpuld Shpludson2019-01-31
|\ \ | |/ |/| | | | | Only generate mentions string if there are mentions See merge request pleroma/pleroma-fe!502
| * Only generate mentions string if there are mentionsshadowfacts2019-01-31
|/ | | Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder.
* Merge branch 'fix/css-margin-adjustments-for-attachments' into 'develop'Shpuld Shpludson2019-01-30
|\ | | | | | | | | Adjust margins for attachments/previews See merge request pleroma/pleroma-fe!501
| * Adjust margins for attachments/previewsshpuld2019-01-30
|/
* Merge branch 'feat/media-modal' into 'develop'lambda2019-01-30
|\ | | | | | | | | modal for viewing attachments in-tab See merge request pleroma/pleroma-fe!468
| * Merge branch 'develop' into feat/media-modalshpuld2019-01-30
| |\ | |/ |/|
* | Merge branch 'fix/timeline-too-eager-flush' into 'develop'lambda2019-01-30
|\ \ | | | | | | | | | | | | | | | | | | Fix #290 Add a better check for fresh TL flushing Closes #290 See merge request pleroma/pleroma-fe!494
| * | Add a better check for fresh TL flushingshpuld2019-01-29
| | |
* | | Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'lambda2019-01-30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix #292 dont show "load more" when bottomed out Closes #292 See merge request pleroma/pleroma-fe!496
| * | | Change panel-footing style to be more fittingshpuld2019-01-29
| | | |
| * | | Add loading indicator for notifications, make timelines indicate bottoming ↵shpuld2019-01-29
| | | | | | | | | | | | | | | | out when no more statuses
* | | | Merge branch 'fix/tall-statuses-v2' into 'develop'lambda2019-01-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | More tall status related fixes that I didn't know was borkd See merge request pleroma/pleroma-fe!498
| * | | | Adjust scrolling logic and document it, make sure to never show 'show less' ↵shpuld2019-01-30
| |/ / / | | | | | | | | | | | | if it's not a tall status
* | | | Merge branch 'fix/reply-to-using-wrong-id' into 'develop'lambda2019-01-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #295 reply-to link pointing to wrong id Closes #295 See merge request pleroma/pleroma-fe!499
| * | | | Fix a simple typoshpuld2019-01-30
| |/ / /
* | | | Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'lambda2019-01-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #289 Make more user links use internal routing Closes #289 See merge request pleroma/pleroma-fe!500
| * | | | Capture clicks on statuses to hijack mention clicks, match mention href to ↵shpuld2019-01-30
| |/ / / | | | | | | | | | | | | user somehow
* | | | Merge branch 'feature/split-hide-network' into 'develop'Shpuld Shpludson2019-01-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma-fe!497
| * | | | Split hide_network into hide_followers & hide_followingsMaxim Filippov2019-01-30
|/ / / /
* | | | Merge branch 'fix/favorites-timelines-fetching-on-direct-url' into 'develop'lambda2019-01-29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix #286 favs timeline fetching when opening profile via direct url Closes #286 See merge request pleroma/pleroma-fe!495
| * | | Fix favs timeline fetching when opening profile via direct urlshpuld2019-01-29
|/ / /
* | | Merge branch 'fix/nav-panel-shadow' into 'develop'lambda2019-01-29
|\ \ \ | | | | | | | | | | | | | | | | Add missing shadow to nav panel See merge request pleroma/pleroma-fe!491
| * | | add missing shadow to nav panelshpuld2019-01-29
| |/ /
* | | Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop'lambda2019-01-29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix #288 - Don't connect WS when chat is disabled Closes #288 See merge request pleroma/pleroma-fe!492
| * | | Connect only after-store instead of when user gets tokenshpuld2019-01-29
| |/ /
* | | Merge branch 'fix/user-by-name-type-error' into 'develop'lambda2019-01-29
|\ \ \ | |/ / |/| | | | | | | | Fix TypeError crash when using url of an invalid user See merge request pleroma/pleroma-fe!493
| * | Fix TypeError crash when using url of an invalid usershpuld2019-01-29
|/ /
* | Merge branch 'feature/link-preview' into 'develop'lambda2019-01-29
|\ \ | | | | | | | | | | | | link previews See merge request pleroma/pleroma-fe!481