Commit graph

1174 commits

Author SHA1 Message Date
Shpuld Shpludson
531f150dd3 Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
#254 Add option to hide filtered statuses

See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
jasper
92874b6902 Fxing conflicts 2019-02-08 13:13:11 -08:00
jasper
70c05a0c08 Fix showFeaturesPanel option as instance 2019-02-08 12:17:14 -08:00
dave
910b63624b #291 - fixed typo 2019-02-08 10:40:03 -05:00
dave
d112d5b333 #291 - remove whitespace 2019-02-08 10:02:00 -05:00
dave
34169e692f #291 - enable media/favorite tabs with prefetched data 2019-02-08 09:56:45 -05:00
jasper
7818d6786b Add option to hide filtered statuses 2019-02-08 05:17:20 -08:00
jasper
10c7365451 Add option to hide filtered statuses 2019-02-08 04:31:44 -08:00
dave
b57b4c6e45 #291 - disable empty tabs in user profile panel 2019-02-08 05:31:06 -05:00
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
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
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
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