Mark Felder
2eda3d687e
Sync up key names properly
2020-06-26 17:02:17 -05:00
Mark Felder
5321415641
Update notification filters to reflect new settings
2020-06-26 16:56:31 -05:00
Mark Felder
199fc9351d
Merge branch 'develop' into refactor/notification_settings
2020-06-25 15:28:17 -05:00
Sergey Suprunenko
2b6d16900b
Use more correct class name for user badges
2020-06-21 15:36:20 +02:00
Sergey Suprunenko
c04f8b2ccb
Show a 'bot' badge on the service account page
2020-06-21 15:06:07 +02:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings
2020-06-21 14:59:05 +02:00
Henry Jameson
5aa65e32ef
fix huge emoji in usernames
2020-06-19 16:09:44 +03:00
Shpuld Shpludson
95f5c7fff6
Merge branch 'iss-149/profile-fields-display' into 'develop'
...
Display profile fields
See merge request pleroma/pleroma-fe!1004
2020-06-19 08:04:54 +00:00
Shpuld Shpludson
6343ee929c
Merge branch '589-poll-options' into 'develop'
...
Polls: Construct an html field during normalization.
Closes #589
See merge request pleroma/pleroma-fe!1146
2020-06-18 13:33:00 +00:00
lain
b0b33be9dd
Poll, StatusContent: Move emoji css to status body.
2020-06-18 14:41:40 +02:00
kPherox
eed58a7b97
fix width of long field value
2020-06-18 20:13:44 +09:00
kPherox
bb513dd961
change key-value to look like one
2020-06-18 20:08:00 +09:00
Shpuld Shpuldson
f1175b4e9b
revert import style
2020-06-18 13:41:04 +03:00
Shpuld Shpuldson
9c884fef11
remove search blocker, fix debounce params
2020-06-18 12:29:13 +03:00
Shpuld Shpuldson
632f62ee0f
resume the previous emoji size for now
2020-06-17 18:34:24 +03:00
Shpuld Shpuldson
580fcd3ad9
restyle the fields
2020-06-17 18:26:06 +03:00
Shpuld Shpuldson
f8cf92a01f
Merge branch 'develop' into kPherox/pleroma-fe-iss-149/profile-fields-display
2020-06-17 11:23:32 +03:00
Shpuld Shpludson
24e47eb604
Update popover.js
2020-06-16 15:12:44 +00:00
Shpuld Shpludson
84a69f9502
Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications'
...
# Conflicts:
# CHANGELOG.md
2020-06-16 14:51:12 +00:00
Shpuld Shpuldson
fc6ca20a42
disable subject field when posting
2020-06-16 17:34:22 +03:00
Shpuld Shpuldson
5a8a428c15
remove log whoops
2020-06-16 17:30:56 +03:00
Shpuld Shpuldson
5cf1574fdb
fix popovers cutting off in notifications, port popover changes from chats mr
2020-06-16 17:20:36 +03:00
lain
d41c9a717c
Polls: Construct an html field during normalization.
2020-06-14 13:16:08 +02:00
Henry Jameson
ac270d7060
fix #866
2020-06-13 14:42:53 +03:00
Henry Jameson
8cd5041663
add support for defining the greentext
2020-06-13 13:25:56 +03:00
Henry Jameson
c13d5b4f1b
Fix faint links in notifications
2020-06-13 13:09:55 +03:00
Shpuld Shpuldson
14348d8ddf
fix the contain option
2020-06-11 14:27:36 +03:00
Shpuld Shpuldson
2b6a6fe7ea
make object-fit cover work like it should
2020-06-11 13:44:32 +03:00
Shpuld Shpludson
4e3ce18703
Merge branch 'feature/autocomplete-domain-mutes' into 'develop'
...
Autocomplete domain mutes from list of known instances
Closes #824
See merge request pleroma/pleroma-fe!1103
2020-06-10 11:18:30 +00:00
Shpuld Shpuldson
ea2b2a35bb
add fade-in fade-out
2020-06-10 12:41:02 +03:00
Shpuld Shpuldson
855b8d4dad
fix conflict
2020-06-10 11:52:46 +03:00
Shpuld Shpuldson
d3187720c5
remove useless captures
2020-06-10 11:49:04 +03:00
Henry Jameson
3cfdfec72d
attempt to fix that one bug with submitting on copy-pasting
2020-06-10 11:18:07 +03:00
Shpuld Shpuldson
cd9d732afa
add better visual indication for dropping files, make dropzone bigger
2020-06-10 11:01:38 +03:00
HJ
aa125072b3
Merge branch 'async-language-loading' into 'develop'
...
Messages: Load languages asynchronously.
See merge request pleroma/pleroma-fe!1136
2020-06-09 09:31:33 +00:00
lain
fbc4889ece
Linting.
2020-06-08 18:26:16 +02:00
lain
e45f7fe877
MediaUpload: Correctly handle multiple uploads.
2020-06-08 18:22:17 +02:00
lain
99eaec8547
Messages: Load languages asynchronously.
...
Reduces the size of the initial app bundle by about half.
2020-06-08 17:22:07 +02:00
lain
e6a27bcaca
MediaUpload: Allow drag-and-drop of multiple files at once
2020-06-08 13:30:16 +02:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances
2020-06-08 13:17:18 +02:00
HJ
66b4121dad
Merge branch 'fix-cropped-button-shadow' into 'develop'
...
Fix the cropped button shadow in 2FA settings
See merge request pleroma/pleroma-fe!1133
2020-06-07 13:52:52 +00:00
Henry Jameson
68482fd3a6
move helpers out of tabs directory
2020-06-07 00:15:10 +03:00
Henry Jameson
9e3e6b0c69
Merge remote-tracking branch 'origin/develop' into settings-modal
...
* origin/develop: (22 commits)
changelog
alignment fixes
Update CHANGELOG.md
StillImage: Make it work properly in both firefox and chrome.
ReactButton: Change the combined emoji (heart) to a simple one.
Linting fixes.
Settings: Keep a local version of the mutedWordsString
MediaModal: Close on browser navigation events.
StatusContent: Try to get hashtag from dataset first.
Docs: Change wrong documentation.
EntityNormalizerSpec: More fixes.
EntityNormalizerSpec: Test new behavior.
EntityNormalizer: Add colons to emoji alt text.
fixed case in class name
The sidebarRight option wasn't being read
Use consistent naming for Pleroma-FE in README
Remove mention of GNU Social
lint
multiple fixes
fix non-mention notifs
...
2020-06-07 00:10:21 +03:00
Karol Kosek
03952832b4
Fix the cropped button shadow in 2FA settings
2020-06-06 22:43:56 +02:00
HJ
e47d0f2103
Merge branch 'fix-reprooted-muted-posts' into 'develop'
...
Fixed some issues with muting
See merge request pleroma/pleroma-fe!1120
2020-06-06 20:31:43 +00:00
Henry Jameson
ebf2ce84fd
alignment fixes
2020-06-06 23:08:52 +03:00
lain
2aabd8ed1a
StillImage: Make it work properly in both firefox and chrome.
2020-06-05 17:55:19 +02:00
Shpuld Shpludson
63f237d736
Merge branch '848-change-emoji-reaction-defaults' into 'develop'
...
ReactButton: Change the combined emoji (heart) to a simple one.
Closes #848
See merge request pleroma/pleroma-fe!1131
2020-06-05 15:36:15 +00:00
lain
ba4c189c53
ReactButton: Change the combined emoji (heart) to a simple one.
2020-06-05 17:26:13 +02:00
lain
c4c5568b98
Linting fixes.
2020-06-05 13:51:47 +02:00