dave
|
20c68d33eb
|
#396: update en.json
|
2019-02-24 15:44:06 -05:00 |
|
dave
|
8275f2aa9a
|
#396: update registration form
|
2019-02-24 14:30:29 -05:00 |
|
Shpuld Shpludson
|
e34e1ccdae
|
Merge branch '227-manage-blocks-mutes' into 'develop'
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
|
2019-02-22 14:54:12 +00:00 |
|
taehoon
|
85d43d17f5
|
Add missing translation strings
|
2019-02-20 13:30:31 -05:00 |
|
taehoon
|
395d212904
|
Add new strings to i18n
|
2019-02-20 13:30:31 -05:00 |
|
taehoon
|
e91a94ff9c
|
Add mutes tab
|
2019-02-20 13:30:30 -05:00 |
|
taehoon
|
52913d8f87
|
Complete functionality of BlockCard
|
2019-02-20 13:30:30 -05:00 |
|
taehoon
|
0220d3d304
|
Finally, added BlockCard
|
2019-02-20 13:30:30 -05:00 |
|
taehoon
|
a56d2dfeb1
|
Add blocks tab with test data to user settings page
|
2019-02-20 13:30:30 -05:00 |
|
dave
|
e20a7be3aa
|
#376: update status timeline when it's empty
|
2019-02-20 10:13:28 -05:00 |
|
shpuld
|
32df77c16a
|
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
|
2019-02-19 18:34:09 +02:00 |
|
Shpuld Shpludson
|
7b9a6f8d43
|
Merge branch '256-avatar-crop-popup' into 'develop'
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
|
2019-02-19 15:37:01 +00:00 |
|
shpuld
|
e801d78e9d
|
Take over branch and fix some issues
|
2019-02-17 18:54:22 +02:00 |
|
taehoon
|
b24db12e1c
|
Make embedded image cropper
|
2019-02-15 13:34:33 -05:00 |
|
taehoon
|
228e6681e3
|
Localization of ImageCropper component
|
2019-02-15 13:34:33 -05:00 |
|
taehoon
|
a001ffecf0
|
Add back the existing translation string
|
2019-02-15 13:34:33 -05:00 |
|
taehoon
|
13725f040b
|
Add avatar crop popup
|
2019-02-15 13:34:33 -05:00 |
|
taehoon
|
971e75aa64
|
Add translation strings
|
2019-02-10 13:26:08 -05: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 |
|
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
|
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 |
|
Mark Felder
|
b3823b79b4
|
Grammar
|
2019-02-06 22:00:31 +00: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
|
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 |
|
eugenijm
|
648f635429
|
Allow to configure visibility for admin and moderator badges
|
2019-02-06 18:07:10 +03:00 |
|
Maxim Filippov
|
0c5c889850
|
Rename "hide_following" to "hide_follows"
|
2019-02-06 14:21:13 +03:00 |
|
Maxim Filippov
|
18594569bd
|
Split hide_network into hide_followers & hide_followings
|
2019-02-06 02:59:59 +03: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
|
54e7e0e31b
|
merge develop and fix conflicts AGAIN
|
2019-02-04 19:49:23 +02: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 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 |
|
taehoon
|
d8ad494081
|
Add avatar size instruction notice
|
2019-02-02 20:39:41 -05:00 |
|
shpuld
|
a8c6b3f538
|
Change video playing default without bothering making it an instance configurable
|
2019-01-31 21:19:41 +02:00 |
|
shpuld
|
c7cffbb6c7
|
Merge branch 'develop' into feat/media-modal
|
2019-01-30 20:49:24 +02:00 |
|
lambda
|
1717e70046
|
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
|
2019-01-30 17:49:27 +00:00 |
|
Maxim Filippov
|
298cea8f6d
|
Split hide_network into hide_followers & hide_followings
|
2019-01-30 01:11:40 +03:00 |
|
shpuld
|
62e9525724
|
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
|
2019-01-29 21:04:52 +02:00 |
|
shpuld
|
51024a2c8a
|
Merge branch 'develop' into feat/media-modal
|
2019-01-28 19:02:46 +02:00 |
|
shpuld
|
0ab828bb30
|
Merge develop and fix conflict
|
2019-01-26 17:50:41 +02:00 |
|
shpuld
|
3978aaef84
|
Redo everything in the MR
|
2019-01-26 17:45:03 +02:00 |
|
William Pitcock
|
7b296696a3
|
user profile: add media timeline
|
2019-01-26 13:49:24 +00:00 |
|
HJ
|
3a3cf1d48a
|
Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI
Closes #265 and #262
See merge request pleroma/pleroma-fe!462
|
2019-01-22 17:46:08 +00:00 |
|
Henry Jameson
|
a680f7d684
|
localization strings
|
2019-01-17 22:49:33 +03:00 |
|
|
|
05ead45fb7
|
Show who to follow in the mobile view
|
2019-01-16 02:33:08 +00:00 |
|
|
|
a60fc390a0
|
Add instance information page for mobile
|
2019-01-07 17:26:47 +00:00 |
|
shpuld
|
f72b1d048e
|
Merge branch 'develop' into feature/replace-panel-switcher
|
2018-12-22 17:32:35 +02:00 |
|
