Commit graph

2110 commits

Author SHA1 Message Date
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
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
dave a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05: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
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
Xiaofeng An f512ee2c3c move login hint into the main content 2019-02-06 05:01:32 -05:00
Xiaofeng An e4c0bbddd9 Merge branch 'develop' into fix/create-a-login-hint-on-mobile 2019-02-06 04:37:00 -05:00
Shpuld Shpludson 2d333f99e8 Merge branch 'patch-1' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!535
2019-02-06 04:29:30 +00: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
HJ 3d337a239e Merge branch 'fix/avatar-link' into 'develop'
Fix avatar link in search result

See merge request pleroma/pleroma-fe!534
2019-02-05 22:46:45 +00:00
tarteka 37c7d850f1 Update es.json 2019-02-05 22:20:45 +00:00
Edijs 52f5ffa862 Fix avatar link in search result 2019-02-05 15:11:17 -07:00
Xiaofeng An d2436fb9e5 move hint inside Timeline component 2019-02-05 15:43:56 -05: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
Xiaofeng An bf642ebab7 fix #308 - hide login hint on desktop 2019-02-05 13:48:12 -05:00
Xiaofeng An c758d103bd fix #308 - show login hint above timeline when user is not logged in 2019-02-05 13:47:27 -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
dev92341 1ee762cf6e Add option to hide features panel 2019-02-05 04:32:00 -08:00
dev92341 f2c6dd6581 Add option to hide features panel 2019-02-05 03:57:11 -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 Shpludson 8c8eb99d73 Merge branch 'feat/follows-following-pagination' into 'develop'
Follows + followers pagination #285

See merge request pleroma/pleroma-fe!510
2019-02-04 17:54:48 +00:00