Commit Graph

1193 Commits

Author SHA1 Message Date
shpuld e801d78e9d Take over branch and fix some issues 2019-02-17 18:54:22 +02:00
Edijs 5d0e51cae3 Fix styling 2019-02-12 09:00:09 -07:00
Edijs dd1b256005 Fix typo 2019-02-11 11:08:25 -07:00
Edijs 9f3f1ee7cb Fix UI of followers list 2019-02-11 11:03:01 -07:00
Shpuld Shpludson 0e6134b32e Merge branch 'issue-332-update-follow-tabs' into 'develop'
#332 - add follow/not follow button to follow list

See merge request pleroma/pleroma-fe!558
2019-02-11 13:29:58 +00:00
Edijs fc26f1852e Merge branch 'develop' into fix/hashtag-opening 2019-02-10 11:59:19 -07:00
dave 4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
Shpuld Shpludson 4bea3c525f Merge branch 'fix/subject-copying-composition-bug' into 'develop'
#326 Subject copying composition bug

See merge request pleroma/pleroma-fe!550
2019-02-09 20:47:29 +00:00
jo 7743e3b277 Add quick css fix for user profile bg img preview 2019-02-09 20:42:51 +00:00
jasper 0a43546564 Switch into Lodash 2019-02-09 04:18:52 -08:00
jasper f75ec48a80 Switch into Lodash 2019-02-09 04:13:52 -08: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
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
jasper e90e7ce2db Subject copying composition bug 2019-02-08 08:25:53 -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
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
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