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 |
|
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 |
|
Shpuld Shpludson
|
d5757d44e5
|
Merge branch 'issue-312-media-upload' into 'develop'
#312 - media uploader not working with same file in adjacent order
See merge request pleroma/pleroma-fe!521
|
2019-02-04 16:48:13 +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 |
|
taehoon
|
0483f1d636
|
Revert a change which can break the theme preview
|
2019-02-03 20:12:22 -05:00 |
|
taehoon
|
ee694d62eb
|
Fix fixed background issue
|
2019-02-03 15:32:24 -05: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
|
063b5ba52b
|
Merge branch 'revert-886aa35e' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma-fe!514
|
2019-02-03 14:37:54 +00: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 |
|