Commit graph

2140 commits

Author SHA1 Message Date
Shpuld Shpludson
cf10fd623b Merge branch 'fix-user-profile-background-setting-preview' into 'develop'
Add quick css fix for user profile bg img preview

See merge request pleroma/pleroma-fe!554
2019-02-09 20:42:51 +00:00
jo
7743e3b277 Add quick css fix for user profile bg img preview 2019-02-09 20:42:51 +00:00
Shpuld Shpludson
d2d06983c9 Merge branch 'patch-2' into 'develop'
Update spanish translate

See merge request pleroma/pleroma-fe!549
2019-02-09 07:06:40 +00:00
Shpuld Shpludson
5296d41372 Merge branch 'fix/js-error-in-tag-page' into 'develop'
Fixed JS error in tag page

See merge request pleroma/pleroma-fe!543
2019-02-09 06:56:46 +00:00
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
9768558e7c Merge branch 'fix/show-features-panel-not-working' into 'develop'
#322 Fix showFeaturesPanel option as instance

See merge request pleroma/pleroma-fe!552
2019-02-08 21:27:58 +00:00
jasper
5b52e020e3 fixing conflicts 2019-02-08 13:20:47 -08:00
jasper
ced29a6482 fixing conflicts 2019-02-08 13:18:50 -08: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
Shpuld Shpludson
da0a5535eb Merge branch 'issue-291-disable-empty-tabs' into 'develop'
#291 - disable empty tabs in user profile panel

See merge request pleroma/pleroma-fe!548
2019-02-08 15:48:07 +00: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
tarteka
b129049fed Update spanish translate 2019-02-08 13:42:02 +00: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
Edijs
0dc7c45f32 Code refactoring 2019-02-07 16:23:18 -07: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
bfe2d8beaa Merge branch 'issue-137-heart-emoji' into 'develop'
#137 - add red heart emoji

See merge request pleroma/pleroma-fe!546
2019-02-07 15:45:00 +00: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
012ce7bad2 #137 - clean up emoji list 2019-02-07 10:29:23 -05:00
dave
bd24c615d1 #315 - revert changes 2019-02-07 09:59:12 -05:00
dave
3128417176 #315 - separate export and fetch follows logic 2019-02-07 09:57:16 -05:00
dave
997c99e45d #137 - add red heart emoji 2019-02-07 06:26:51 -05:00
Shpuld Shpludson
9516d5dd73 Merge branch 'english-login' into 'develop'
Grammar

See merge request pleroma/pleroma-fe!542
2019-02-07 04:13:56 +00:00
Edijs
19870c0b6d Fix issue while fetching timelines for tag page 2019-02-06 19:19:43 -07:00
Edijs
fafe258f2b Typo 2019-02-06 19:19:14 -07:00
Mark Felder
b3823b79b4 Grammar 2019-02-06 22:00:31 +00:00
shpuld
4dbc6a3c56 Fix repeater html not showing properly 2019-02-06 22:17:06 +02:00
Xiaofeng An
e107ed8ddc Merge branch 'develop' into feature/add-an-option-for-a-default-formatting 2019-02-06 14:28:50 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
jasper
fbdb7d3d95 Add german translation for option label 2019-02-06 10:50:21 -08:00
dave
a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05:00
jasper
a57f8bdd68 Add option to hide filtered statuses 2019-02-06 10:18:13 -08:00
Shpuld Shpludson
6cca15bade Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop'
create a login hint on mobile

Closes #308

See merge request pleroma/pleroma-fe!530
2019-02-06 18:13:56 +00:00
Xiaofeng An
a40d1eb3a0 remove unnecessary div 2019-02-06 11:53:51 -05: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