lain
|
391f796cb4
|
Merge branch 'feat/preload-data-from-html' into 'develop'
Add basic preloading for nodeinfo/config
See merge request pleroma/pleroma-fe!1155
|
2020-06-27 10:21:06 +00:00 |
|
Shpuld Shpuldson
|
46cf50a4d6
|
rename variable requestJson when it's not actually json
|
2020-06-27 12:59:24 +03:00 |
|
Shpuld Shpuldson
|
a8cb5e71d9
|
don't block ui with stickers or tos
|
2020-06-27 12:32:01 +03:00 |
|
Shpuld Shpuldson
|
5ab62c4cb8
|
make use of api/v1/instance
|
2020-06-27 12:26:19 +03:00 |
|
Shpuld Shpludson
|
4d52b8bf56
|
Merge branch 'remove-twitterapi-config' into 'develop'
Remove StatusNet config endpoint usage
See merge request pleroma/pleroma-fe!1084
|
2020-06-27 09:19:43 +00:00 |
|
Shpuld Shpuldson
|
58f9c1cc49
|
fix conflict in after_store
|
2020-06-27 12:10:02 +03:00 |
|
Shpuld Shpuldson
|
3113d904b9
|
update changelog with profile fields
|
2020-06-27 10:34:28 +03:00 |
|
Shpuld Shpludson
|
c658f57abb
|
Merge branch 'iss-149/profile-fields-setting' into 'develop'
Profile fields setting
See merge request pleroma/pleroma-fe!997
|
2020-06-27 07:32:59 +00:00 |
|
Shpuld Shpludson
|
8150899a73
|
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma-fe!1152
|
2020-06-27 07:21:32 +00:00 |
|
translate
|
4528b31256
|
Translated using Weblate (Italian)
Currently translated at 72.7% (452 of 621 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
|
2020-06-27 07:21:32 +00:00 |
|
Shpuld Shpludson
|
ea0a12f604
|
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
|
2020-06-27 07:19:49 +00:00 |
|
Mark Felder
|
2eda3d687e
|
Sync up key names properly
|
2020-06-26 17:02:17 -05:00 |
|
Mark Felder
|
6606b57f44
|
Update english i18n
|
2020-06-26 16:59:22 -05:00 |
|
Mark Felder
|
caf9a2a8f6
|
Revert i18n to develop
|
2020-06-26 16:56:57 -05:00 |
|
Mark Felder
|
5321415641
|
Update notification filters to reflect new settings
|
2020-06-26 16:56:31 -05:00 |
|
Shpuld Shpuldson
|
8c3106c588
|
Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used
|
2020-06-26 18:20:32 +03:00 |
|
Shpuld Shpuldson
|
a2c5175d14
|
add basic preloading for nodeinfo/config
|
2020-06-26 14:47:02 +03:00 |
|
Shpuld Shpuldson
|
44edb730c1
|
rip restyle subject, fix some issues with long subject
|
2020-06-26 14:07:39 +03:00 |
|
Mark Felder
|
8e1e7144fd
|
Change notification settings keys to new names, remove the defunct non_follows key.
|
2020-06-25 15:34:48 -05:00 |
|
Mark Felder
|
199fc9351d
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-25 15:28:17 -05:00 |
|
lain
|
504d48fc5a
|
After Store: Remove last statusnet vestiges.
|
2020-06-24 17:54:35 +02:00 |
|
lain
|
143da55c56
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into remove-twitterapi-config
|
2020-06-24 17:50:05 +02:00 |
|
lain
|
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 |
|
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 |
|
lain
|
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 |
|
lain
|
ed908e0195
|
Changelog: Add info about push notifications.
|
2020-06-19 15:25:57 +02:00 |
|
lain
|
aa725010c5
|
ServiceWorker: Use clearer variable names
|
2020-06-19 15:24:06 +02:00 |
|
HJ
|
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 |
|
Henry Jameson
|
5aa65e32ef
|
fix huge emoji in usernames
|
2020-06-19 16:09:44 +03:00 |
|
kPherox
|
bad3dacfac
|
implement user suggestor for profile fields
|
2020-06-19 21:18:36 +09:00 |
|
kPherox
|
fd2157efe4
|
Fix emoji input error
|
2020-06-19 20:51:53 +09:00 |
|
lain
|
4da0a0c0bf
|
StatusContent: Fix greentext.
|
2020-06-19 12:49:42 +02:00 |
|
lain
|
a79bad5cdb
|
StatusContent: Better separate subject from status content.
|
2020-06-19 12:46:48 +02: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 Shpuldson
|
c4340ad467
|
move favicon
|
2020-06-18 17:09:30 +03:00 |
|
Shpuld Shpuldson
|
8a9654b511
|
Merge branch 'develop' into features/favicons
|
2020-06-18 16:47:37 +03:00 |
|
Shpuld Shpuldson
|
6d2befa452
|
move favicon to name
|
2020-06-18 16:47:32 +03: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 |
|
lain
|
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 |
|
Shpuld Shpuldson
|
4e0b4427a9
|
remove recentqueries thing
|
2020-06-18 14:19:21 +03: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
|
fa7bcb74ce
|
return the correct promise type from action
|
2020-06-18 13:00:09 +03:00 |
|
Shpuld Shpuldson
|
abbad84b00
|
update changelog
|
2020-06-18 12:56:22 +03:00 |
|
Shpuld Shpuldson
|
9c884fef11
|
remove search blocker, fix debounce params
|
2020-06-18 12:29:13 +03:00 |
|
Shpuld Shpludson
|
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 |
|