063b5ba52b
Merge branch 'revert-886aa35e' into 'develop'
...
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma-fe!514
2019-02-03 14:37:54 +00:00
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
18ae7bd5f3
Combine friends/followers
2019-02-03 11:58:49 +02:00
b614cb94e5
merge develop in
2019-02-03 10:13:09 +02:00
c7ee2ed831
Merge branch '238-add-avatar-size-suggestion' into 'develop'
...
Add avatar size instruction notice
Closes #238
See merge request pleroma/pleroma-fe!512
2019-02-03 07:05:38 +00:00
f0721ed83b
Merge branch 'fix/default-inlined-videos' into 'develop'
...
Change video playing default without bothering making it an instance configurable
See merge request pleroma/pleroma-fe!505
2019-02-03 06:45:04 +00:00
1e40e70efc
#306 - fix conversation arrow smushed in notifications panel
2019-02-02 21:49:07 -05:00
d8ad494081
Add avatar size instruction notice
2019-02-02 20:39:41 -05:00
4833f79cc2
Fix class ordering issues related to avatar
2019-02-02 15:50:25 -05:00
0b66a43a83
Improve reusability of UserAvatar component
2019-02-02 15:33:02 -05:00
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02:00
89b9aed134
Move avatar css into a correct place
2019-02-02 14:33:13 -05:00
d607e4195a
Migrate StillImage to UserAvatar for avatars
2019-02-02 14:23:52 -05:00
9c4092dbd5
Use a correct avatar placeholder image
2019-02-02 14:17:00 -05:00
95b735ff72
Show placeholder image if avatar image url is broken
2019-02-02 14:11:36 -05:00
815b9d2391
Merge branch 'fix-max-id-for-notifications' into 'develop'
...
Fix incorrect latest_id value in notifications_read request
See merge request pleroma/pleroma-fe!509
2019-02-02 15:51:06 +00:00
b62d2c76e5
Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications)
2019-02-02 18:40:47 +03:00
0ab2f17991
Explicitly cast notification ids to integers when using them for setting maxId
...
This fixes the bug where BE receives incorrect `since_id` when marking
notifications as read.
2019-02-02 17:04:09 +03:00
0fba655cf0
Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into 'develop'
...
fix #157 show screen_name when name is empty in retweet
Closes #157
See merge request pleroma/pleroma-fe!508
2019-02-02 05:52:39 +00:00
7d93beb96d
fix #157 show screen_name when name is empty in retweet
2019-02-01 17:40:06 -05:00
75b8b5d1eb
Merge branch 'fix/name-field-length-should-be-as-wide-as-the-bio-field' into 'develop'
...
fix #209 make name field length as wide as the bio field
Closes #209
See merge request pleroma/pleroma-fe!507
2019-02-01 21:32:31 +00:00
9eddaf6c3e
fix #209 make name field length as wide as the bio field
2019-02-01 16:12:14 -05:00
1a6207be1d
Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'
...
Fix #298 Add option to tab switcher to not render background tabs
Closes #298
See merge request pleroma/pleroma-fe!504
2019-01-31 19:21:49 +00:00
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
8ce513ed09
initial draft for follows/following pagination
2019-01-31 21:11:28 +02:00
3e4c598af4
Merge branch 'fix/statistics' into 'develop'
...
Fix statistics label visibility via configuration
See merge request pleroma/pleroma-fe!503
2019-01-31 15:11:29 +00:00
59d47aa44a
Merge branch 'patch-1' into 'develop'
...
Only generate mentions string if there are mentions
See merge request pleroma/pleroma-fe!502
2019-01-31 15:06:26 +00:00
476bf0afe1
Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher
2019-01-31 17:00:31 +02:00
6a8d10f0bb
Fix statistics label visibility via configuration
2019-01-30 18:53:34 -07:00
3c4cf5ed11
Only generate mentions string if there are mentions
...
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.
2019-01-31 00:50:19 +00:00
fbe7af3d56
Merge branch 'fix/css-margin-adjustments-for-attachments' into 'develop'
...
Adjust margins for attachments/previews
See merge request pleroma/pleroma-fe!501
2019-01-30 19:45:15 +00:00
aaa5f1a638
Adjust margins for attachments/previews
2019-01-30 21:41:07 +02:00
5b7b1dfebc
Merge branch 'feat/media-modal' into 'develop'
...
modal for viewing attachments in-tab
See merge request pleroma/pleroma-fe!468
2019-01-30 18:58:08 +00:00
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
b1facdf7ad
Merge branch 'fix/timeline-too-eager-flush' into 'develop'
...
Fix #290 Add a better check for fresh TL flushing
Closes #290
See merge request pleroma/pleroma-fe!494
2019-01-30 17:51:12 +00:00
1717e70046
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
...
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
0bd77149a0
Merge branch 'fix/tall-statuses-v2' into 'develop'
...
More tall status related fixes that I didn't know was borkd
See merge request pleroma/pleroma-fe!498
2019-01-30 17:47:46 +00:00
d0df98f99b
Merge branch 'fix/reply-to-using-wrong-id' into 'develop'
...
Fix #295 reply-to link pointing to wrong id
Closes #295
See merge request pleroma/pleroma-fe!499
2019-01-30 17:46:52 +00:00
7b0e3dc471
Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'
...
Fix #289 Make more user links use internal routing
Closes #289
See merge request pleroma/pleroma-fe!500
2019-01-30 17:46:18 +00:00
886aa35eb6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma-fe!497
2019-01-30 17:41:54 +00:00
15603981f8
Capture clicks on statuses to hijack mention clicks, match mention href to user somehow
2019-01-30 19:24:47 +02:00
16a5272726
Fix a simple typo
2019-01-30 16:57:19 +02:00
0a39159fdf
Adjust scrolling logic and document it, make sure to never show 'show less' if it's not a tall status
2019-01-30 16:38:28 +02:00
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
7666d50d8a
Change panel-footing style to be more fitting
2019-01-29 21:11:00 +02:00
43c26a4cd0
Merge branch 'fix/favorites-timelines-fetching-on-direct-url' into 'develop'
...
Fix #286 favs timeline fetching when opening profile via direct url
Closes #286
See merge request pleroma/pleroma-fe!495
2019-01-29 19:10:33 +00:00
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
0a0dffa793
Fix favs timeline fetching when opening profile via direct url
2019-01-29 19:12:47 +02:00
89bfc41174
Add a better check for fresh TL flushing
2019-01-29 18:40:49 +02:00
3cfbf0141f
Merge branch 'fix/nav-panel-shadow' into 'develop'
...
Add missing shadow to nav panel
See merge request pleroma/pleroma-fe!491
2019-01-29 15:57:52 +00:00
Shpuld Shpludson