8e1e7144fd
Change notification settings keys to new names, remove the defunct non_follows key.
2020-06-25 15:34:48 -05:00
199fc9351d
Merge branch 'develop' into refactor/notification_settings
2020-06-25 15:28:17 -05:00
bbb91d8ae3
Merge branch 'feature/bot-flag' into 'develop'
...
Add 'Bot' settings option and badge
Closes #832
See merge request pleroma/pleroma-fe!1153
2020-06-22 12:51:51 +00:00
2b6d16900b
Use more correct class name for user badges
2020-06-21 15:36:20 +02:00
c04f8b2ccb
Show a 'bot' badge on the service account page
2020-06-21 15:06:07 +02:00
2451956d83
Add 'bot' flag to Profile settings
2020-06-21 14:59:05 +02:00
1afa0f0044
Merge branch 'notification-unification-experiments' into 'develop'
...
Notification unification / WebPush i18n.
See merge request pleroma/pleroma-fe!1142
2020-06-19 13:34:04 +00:00
ed908e0195
Changelog: Add info about push notifications.
2020-06-19 15:25:57 +02:00
aa725010c5
ServiceWorker: Use clearer variable names
2020-06-19 15:24:06 +02:00
267102809d
Merge branch 'fix-username-emoji' into 'develop'
...
fix huge emoji in usernames
See merge request pleroma/pleroma-fe!1151
2020-06-19 13:15:22 +00:00
5aa65e32ef
fix huge emoji in usernames
2020-06-19 16:09:44 +03:00
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
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
b0b33be9dd
Poll, StatusContent: Move emoji css to status body.
2020-06-18 14:41:40 +02:00
2ea5bff3a7
Merge branch 'feat/tweak-autocomplete-search' into 'develop'
...
Autocomplete tweaks: remove search blocker, fix debounce params #869
See merge request pleroma/pleroma-fe!1149
2020-06-18 11:29:50 +00:00
4e0b4427a9
remove recentqueries thing
2020-06-18 14:19:21 +03:00
eed58a7b97
fix width of long field value
2020-06-18 20:13:44 +09:00
bb513dd961
change key-value to look like one
2020-06-18 20:08:00 +09:00
f1175b4e9b
revert import style
2020-06-18 13:41:04 +03:00
fa7bcb74ce
return the correct promise type from action
2020-06-18 13:00:09 +03:00
abbad84b00
update changelog
2020-06-18 12:56:22 +03:00
9c884fef11
remove search blocker, fix debounce params
2020-06-18 12:29:13 +03:00
ebf4321e64
Merge branch 'fix/popovers-cutting-off-in-notifications' into 'develop'
...
Fix popovers cutting off in notifications #809
Closes #809
See merge request pleroma/pleroma-fe!1147
2020-06-18 06:08:07 +00:00
632f62ee0f
resume the previous emoji size for now
2020-06-17 18:34:24 +03:00
580fcd3ad9
restyle the fields
2020-06-17 18:26:06 +03:00
f8cf92a01f
Merge branch 'develop' into kPherox/pleroma-fe-iss-149/profile-fields-display
2020-06-17 11:23:32 +03:00
24e47eb604
Update popover.js
2020-06-16 15:12:44 +00:00
84a69f9502
Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications'
...
# Conflicts:
# CHANGELOG.md
2020-06-16 14:51:12 +00:00
57626c125d
Merge branch 'fix/disable-subject-when-posting' into 'develop'
...
disable subject field when posting #868
See merge request pleroma/pleroma-fe!1148
2020-06-16 14:43:48 +00:00
c18a8ab308
update changelog
2020-06-16 17:35:12 +03:00
fc6ca20a42
disable subject field when posting
2020-06-16 17:34:22 +03:00
5a8a428c15
remove log whoops
2020-06-16 17:30:56 +03:00
5cf1574fdb
fix popovers cutting off in notifications, port popover changes from chats mr
2020-06-16 17:20:36 +03:00
14540e2a07
Service Worker: Extract messages to own module.
2020-06-16 13:27:58 +02:00
8427c5a067
Changelog: Add info about poll option emoji.
2020-06-15 09:59:39 +02:00
8a15900c81
Merge branch 'themes-fixes' into 'develop'
...
Several small fixes
Closes #866 and #864
See merge request pleroma/pleroma-fe!1145
2020-06-14 13:38:24 +00:00
c0a4752bd5
changelog
2020-06-14 16:14:32 +03:00
72ee51c85c
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
2020-06-14 13:09:14 +00:00
d41c9a717c
Polls: Construct an html field during normalization.
2020-06-14 13:16:08 +02:00
ac270d7060
fix #866
2020-06-13 14:42:53 +03:00
8cd5041663
add support for defining the greentext
2020-06-13 13:25:56 +03:00
e4b18deece
fix redmond themes
2020-06-13 13:16:53 +03:00
c13d5b4f1b
Fix faint links in notifications
2020-06-13 13:09:55 +03:00
1e57adf6d4
Linting + docs
2020-06-13 11:53:16 +02:00
9bfb3754c1
ServiceWorker: Use loader to only notification messages.
...
This keeps the translation size very small and makes it easy to
integrate all the languages, as dynamically loading them isn't
easy in the service worker.
2020-06-13 11:48:02 +02:00
7de56a8063
Merge branch 'chore/improve-default-tos' into 'develop'
...
update terms of service instructions
See merge request pleroma/pleroma-fe!986
2020-06-12 14:26:40 +00:00
fd109fa355
Merge branch 'develop' into 'chore/improve-default-tos'
...
# Conflicts:
# static/terms-of-service.html
2020-06-12 14:17:56 +00:00
33c1adbef4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into notification-unification-experiments
2020-06-12 12:58:01 +02:00
48365819d1
Merge branch 'depatchou' into 'develop'
...
Remove pizza
See merge request pleroma/pleroma-fe!1143
2020-06-11 17:48:15 +00:00
17b6396333
Update lockfile
2020-06-11 19:11:56 +02:00
Mark Felder