HJ
62b3b9b8d4
Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
...
Add admin and moderator indicators to the user profile
See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
eugenijm
19dbdd24b4
Update user settings text: staff badges are only visible in user profile
...
Use capitalized text in badges
2019-02-08 01:33:24 +03:00
Edijs
d39e2643f5
Fix lint warning
2019-02-07 14:56:00 -07:00
Edijs
e44d8ad71e
Extract tag name from href and open in same tab
2019-02-07 14:54:49 -07:00
Shpuld Shpludson
9b49fa3c0c
Merge branch '287-following-followers-tabs' into 'develop'
...
Hide Following/Followers tabs if user has them disabled
Closes #287
See merge request pleroma/pleroma-fe!515
2019-02-07 15:59:37 +00:00
Shpuld Shpludson
85e281d406
Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'
...
#301 - add an option for a default formatting
See merge request pleroma/pleroma-fe!541
2019-02-07 15:55:54 +00:00
taehoon
55da7dbfde
Fix naming
2019-02-07 10:53:36 -05:00
taehoon
fae93217b8
Show back followees/followers counts
2019-02-07 10:48:47 -05:00
taehoon
ea1d7f46b5
Always show my own followees/followers
2019-02-07 10:48:47 -05:00
taehoon
55fc31ea4d
Hide followers and followees tabs when they are disabled
2019-02-07 10:48:47 -05:00
Shpuld Shpludson
05ef0432d3
Merge branch 'issue-315-csv-export' into 'develop'
...
#315 - export all follows as CSV
See merge request pleroma/pleroma-fe!538
2019-02-07 15:42:18 +00:00
dave
3128417176
#315 - separate export and fetch follows logic
2019-02-07 09:57:16 -05:00
Edijs
a215f6856d
Always open tag in same instance
2019-02-06 21:26:32 -07:00
Edijs
fafe258f2b
Typo
2019-02-06 19:19:14 -07:00
shpuld
4dbc6a3c56
Fix repeater html not showing properly
2019-02-06 22:17:06 +02:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
Edijs
a12397cf38
Hashtag opens in same tab
2019-02-06 11:34:21 -07:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
dave
2f12ac7ea4
#315 - export all follows as CSV
2019-02-06 11:17:23 -05:00
eugenijm
fd4cd2e10a
Make role badge visible only on user profile page
2019-02-06 18:07:37 +03:00
eugenijm
676e6da3a5
Add theming support for admin/moderator badges
2019-02-06 18:07:37 +03:00
eugenijm
d00b74b607
Refactor visibleRole for better readability
...
Improve translation
2019-02-06 18:07:37 +03:00
eugenijm
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
eugenijm
c714eb2600
Add admin and moderator indicators to the user card
2019-02-06 18:04:21 +03:00
Shpuld Shpludson
6a867f6ae3
Merge branch 'feature/split-hide-network-fixed' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma-fe!536
2019-02-06 14:38:50 +00:00
Maxim Filippov
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
Shpuld Shpludson
68e5360229
Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'
...
Add option to hide features panel
See merge request pleroma/pleroma-fe!529
2019-02-06 04:21:06 +00:00
Maxim Filippov
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00
Edijs
52f5ffa862
Fix avatar link in search result
2019-02-05 15:11:17 -07:00
Shpuld Shpludson
2db7774a3a
Merge branch 'issue-316-empty-username' into 'develop'
...
#316 - fix empty username issue
See merge request pleroma/pleroma-fe!531
2019-02-05 19:58:45 +00:00
dave
0b24454561
#316 - fix empty username issue
2019-02-05 14:33:16 -05:00
Shpuld Shpludson
8e51c78471
Merge branch 'issue-138-html-escaping' into 'develop'
...
#138 - escape html entities in BIO text
See merge request pleroma/pleroma-fe!522
2019-02-05 15:24:31 +00:00
shpuld
5974dfebfb
Fix mishandled @error in stillImage
2019-02-05 17:17:50 +02:00
dev92341
e3da156162
Add option to hide features panel (About page)
2019-02-05 06:12:14 -08:00
dave
94fdc2d583
#138 - fix lint error
2019-02-04 15:06:38 -05:00
dave
e1f9298ef2
#138 - unescape user bio
2019-02-04 15:03:01 -05:00
dave
c1883f5282
#138 - escape html entities in BIO text
2019-02-04 14:25:21 -05:00
Shpuld Shpludson
448317338e
Merge branch '309-add-logo-to-hamburger-menu' into 'develop'
...
Add logo and sitename to the side drawer area
Closes #309
See merge request pleroma/pleroma-fe!517
2019-02-04 19:00:38 +00:00
taehoon
13ee624341
Do not use BEM
2019-02-04 13:34:07 -05:00
taehoon
5675b9326c
Improve readability using v-if and v-else
2019-02-04 13:30:33 -05:00
taehoon
4528a4cbfa
Show logo/sitename in the side drawer only if logged out
2019-02-04 13:30:33 -05:00
taehoon
537631002b
Add logo and sitename to the side drawer area
2019-02-04 13:30:32 -05:00
shpuld
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
Shpuld Shpludson
3cd1deb133
Merge branch 'issue-154-shorten-cw-subject' into 'develop'
...
Issue #154 shorten subject
Closes #154
See merge request pleroma/pleroma-fe!520
2019-02-04 17:29:58 +00:00
dave
97fbc1d402
#312 - media uploader not working with same file in adjacent order
2019-02-04 10:45:26 -05:00
dave
9d72c7e1bd
#154 - update long subject determine logic, meaningful variable names
2019-02-04 09:28:14 -05:00
dave
887f1def2e
handle poster attachment with tall subjects
2019-02-04 03:16:55 -05:00
dave
06cf8628e5
shorten incredibly long content warning or subject
2019-02-03 23:47:26 -05:00
Shpuld Shpludson
bb335ea71b
Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop'
...
#307 - replace user links with router links in repeats
See merge request pleroma/pleroma-fe!516
2019-02-04 04:22:33 +00:00
Shpuld Shpludson
d6ee6e8394
Merge branch '275-avatar-placeholder' into 'develop'
...
Support avatar placeholder
Closes #275
See merge request pleroma/pleroma-fe!511
2019-02-04 04:17:11 +00:00
Xiaofeng An
abf53838e2
#307 - replace user links with router links in repeats
2019-02-03 14:08:04 -05:00
taehoon
e7f43d6bc3
Use an existing image served by backend instead
2019-02-03 13:30:54 -05:00
Shpuld Shpludson
7115584882
Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop'
...
#306 - fix conversation arrow smushed in notifications panel
See merge request pleroma/pleroma-fe!513
2019-02-03 15:10:19 +00:00
Xiaofeng An
6d3a7809be
#306 - fix conversation arrow smushed in notifications panel
2019-02-03 09:59:32 -05:00
Xiaofeng An
965a578561
Revert " #306 - fix conversation arrow smushed in notifications panel"
...
This reverts commit 1e40e70efc
.
2019-02-03 09:49:22 -05:00
Shpuld Shpludson
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
18ae7bd5f3
Combine friends/followers
2019-02-03 11:58:49 +02:00
shpuld
b614cb94e5
merge develop in
2019-02-03 10:13:09 +02:00
Shpuld Shpludson
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
Shpuld Shpludson
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
Xiaofeng An
1e40e70efc
#306 - fix conversation arrow smushed in notifications panel
2019-02-02 21:49:07 -05:00
taehoon
d8ad494081
Add avatar size instruction notice
2019-02-02 20:39:41 -05:00
taehoon
4833f79cc2
Fix class ordering issues related to avatar
2019-02-02 15:50:25 -05:00
taehoon
0b66a43a83
Improve reusability of UserAvatar component
2019-02-02 15:33:02 -05:00
shpuld
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02:00
taehoon
89b9aed134
Move avatar css into a correct place
2019-02-02 14:33:13 -05:00
taehoon
d607e4195a
Migrate StillImage to UserAvatar for avatars
2019-02-02 14:23:52 -05:00
taehoon
9c4092dbd5
Use a correct avatar placeholder image
2019-02-02 14:17:00 -05:00
taehoon
95b735ff72
Show placeholder image if avatar image url is broken
2019-02-02 14:11:36 -05:00
Shpuld Shpludson
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
Joshua Burch
7d93beb96d
fix #157 show screen_name when name is empty in retweet
2019-02-01 17:40:06 -05:00
Joshua Burch
9eddaf6c3e
fix #209 make name field length as wide as the bio field
2019-02-01 16:12:14 -05:00
Shpuld Shpludson
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
shpuld
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
shpuld
8ce513ed09
initial draft for follows/following pagination
2019-01-31 21:11:28 +02:00
Shpuld Shpludson
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
shpuld
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
Edijs
6a8d10f0bb
Fix statistics label visibility via configuration
2019-01-30 18:53:34 -07:00
shadowfacts
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
shpuld
aaa5f1a638
Adjust margins for attachments/previews
2019-01-30 21:41:07 +02:00
shpuld
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
lambda
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
lambda
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
lambda
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
lambda
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
shpuld
15603981f8
Capture clicks on statuses to hijack mention clicks, match mention href to user somehow
2019-01-30 19:24:47 +02:00
shpuld
16a5272726
Fix a simple typo
2019-01-30 16:57:19 +02:00
shpuld
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
Maxim Filippov
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
shpuld
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
shpuld
0a0dffa793
Fix favs timeline fetching when opening profile via direct url
2019-01-29 19:12:47 +02:00
shpuld
1f3cf6d1fc
add missing shadow to nav panel
2019-01-29 16:32:34 +02:00
lambda
4185452b52
Merge branch 'feature/link-preview' into 'develop'
...
link previews
See merge request pleroma/pleroma-fe!481
2019-01-29 14:12:18 +00:00
shpuld
c3a931610a
remove log
2019-01-28 22:03:25 +02:00
shpuld
0460728a8c
Fix tall status expanding needing extra clicks, make tall status expand automatically in conversation when focused
2019-01-28 21:59:17 +02:00
shpuld
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
lambda
bb2ee04f04
Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop'
...
fix/don't fetch favs if the profile isnt current user
See merge request pleroma/pleroma-fe!484
2019-01-28 16:22:03 +00:00
shpuld
4d3907b86a
Formatting
2019-01-28 17:48:00 +02:00
shpuld
1b76a5a9ea
Add back that login error thing that someone removed
2019-01-28 17:43:51 +02:00
shpuld
82ef57cd59
dont fetch favs if profile isnt us
2019-01-28 16:59:01 +02:00