Commit graph

3724 commits

Author SHA1 Message Date
William Pitcock
2c6ec37e6a media description support 2020-06-28 02:10:06 -04: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 Shpuldson
58f9c1cc49 fix conflict in after_store 2020-06-27 12:10:02 +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
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
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
aa725010c5 ServiceWorker: Use clearer variable names 2020-06-19 15:24:06 +02: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 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
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
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
14540e2a07 Service Worker: Extract messages to own module. 2020-06-16 13:27:58 +02:00
lain
72ee51c85c Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js 2020-06-14 13:09:14 +00: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
lain
1e57adf6d4 Linting + docs 2020-06-13 11:53:16 +02:00
lain
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
lain
33c1adbef4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into notification-unification-experiments 2020-06-12 12:58:01 +02:00
lain
0c36486299 API: Remove fetch polyfill
All browser except IE have supported this for longer than
Pleroma even exists.
2020-06-11 18:49:39 +02:00
lain
178ff1672d PersistedState: Replace object-path with lodash function
We were loading that one anyway.
2020-06-11 18:44:45 +02:00
lain
8d7d4980b9 StatusParser: Remove unused removeAttachmentLinks.
Brings down the vendor by over 200kb
2020-06-11 18:39:19 +02:00
lain
98819ae32c NotificationUtils: Add tag to notifications. 2020-06-11 15:49:39 +02:00
lain
e2ca107e01 ServiceWorker: Don't show message via sw if a client is active. 2020-06-11 15:26:52 +02:00
lain
5b0190bef5 ServiceWorker: Grab the notification and display it with i18n. 2020-06-11 15:22:58 +02:00
lain
a52a393266 NotificationUtils: Extract preparation of notification object. 2020-06-11 15:22:31 +02:00
Ben Is
c59c0ec4be Translated using Weblate (Italian)
Currently translated at 72.6% (451 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-11 12:48:44 +00: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
Ben Is
7b9fa32585 Translated using Weblate (Italian)
Currently translated at 68.5% (426 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-10 10:27:55 +00:00
hj
ff2cd3d672 Translated using Weblate (Russian)
Currently translated at 60.0% (373 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
2020-06-10 10:27:55 +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
kPherox
cc4691a4ef
Fix merging array field for users 2020-06-10 03:48:49 +09:00
kPherox
de9cc033df
Add i18n en 2020-06-10 03:48:41 +09:00
kPherox
54fdc22001
Add profile fields form 2020-06-10 03:37:58 +09: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
44db3af0db Messages: DRY things up a bit. 2020-06-09 09:27:57 +02: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
acbef1ebdc Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Weblate pleroma pleroma fe

See merge request pleroma/pleroma-fe!1134
2020-06-07 15:21:05 +00:00
Henry Jameson
1e554ee287 indent 2 2020-06-07 18:19:34 +03: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
Ben Is
8b43893c47 Translated using Weblate (Italian)
Currently translated at 65.7% (403 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-05 16:13:45 +00:00
Evert Prants
419fdd58a5 Translated using Weblate (Estonian)
Currently translated at 61.5% (377 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/et/
2020-06-05 16:13:45 +00:00
Anonymous
1c4be95384 Translated using Weblate (French)
Currently translated at 99.8% (612 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
2020-06-05 16:13:45 +00:00
Haelwenn (lanodan) Monnier
49d0a05644 Translated using Weblate (French)
Currently translated at 99.8% (612 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
2020-06-05 16:13:45 +00:00
Evert Prants
f5c4d7d989 Translated using Weblate (Estonian)
Currently translated at 54.3% (333 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/et/
2020-06-05 16:13:45 +00:00
Fristi
790825257f Translated using Weblate (Dutch)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-06-05 16:13:45 +00:00
Anonymous
654105d5c1 Translated using Weblate (Dutch)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
2020-06-05 16:13:45 +00:00
Ben Is
a0d935649b Translated using Weblate (Italian)
Currently translated at 65.0% (399 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-05 16:13:45 +00:00
Ben Is
e1475d7f57 Translated using Weblate (English)
Currently translated at 100.0% (613 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-06-05 16:13:45 +00:00
Ben Is
5048f203a3 Translated using Weblate (Italian)
Currently translated at 64.1% (393 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-05 16:13:45 +00:00
Chuculate
18997c2d07 Translated using Weblate (Spanish)
Currently translated at 84.3% (517 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2020-06-05 16:13:45 +00:00
Ben Is
e0e1fe5e20 Translated using Weblate (Italian)
Currently translated at 51.8% (318 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-06-05 16:13:45 +00: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
lain
282e10e3be Settings: Keep a local version of the mutedWordsString
Without this it was impossible to use newlines
2020-06-05 13:42:39 +02:00
HJ
c678756eba Merge branch '748-hashtag-link-fixes' into 'develop'
StatusContent: Try to get hashtag from dataset first.

Closes #748

See merge request pleroma/pleroma-fe!1128
2020-06-04 16:06:33 +00:00
HJ
a6f73d7da5 Merge branch '788-hide-media-viewer-on-navigation' into 'develop'
MediaModal: Close on browser navigation events.

Closes #788

See merge request pleroma/pleroma-fe!1129
2020-06-04 16:00:53 +00:00
lain
cb99dc2b27 MediaModal: Close on browser navigation events. 2020-06-04 16:30:28 +02:00
lain
d872d55832 StatusContent: Try to get hashtag from dataset first. 2020-06-04 15:50:44 +02:00
lain
f197a2aa39 EntityNormalizer: Add colons to emoji alt text.
This makes it possible to copy them and still have them work.
2020-06-04 15:12:03 +02:00
Henry Jameson
de3a376beb fixed case in class name 2020-06-02 01:16:10 +03:00
Henry Jameson
4fae2f8ea8 track if settings modal has been opened once 2020-06-02 01:10:52 +03:00
Henry Jameson
94436c1f85 fixed tab not hiding 2020-05-29 13:39:30 +03:00
Henry Jameson
9a20a90932 fixed the remaining issues 2020-05-28 21:28:01 +03:00
Mark Felder
5f41ee8864 The sidebarRight option wasn't being read 2020-05-28 12:28:32 -05:00
Mark Felder
b8350423d9 Updated Notification Settings API use 2020-05-28 10:57:02 -05:00
Henry Jameson
5ffcddd3b9 fixes. sorry for bad commit message i'm tired 2020-05-27 03:32:57 +03:00
Henry Jameson
3938ccb8e7 lint 2020-05-27 00:02:36 +03:00
Henry Jameson
a8e013bd65 Move modal frame parts away from modal-content into modal, improve error handling 2020-05-26 23:58:55 +03:00
Henry Jameson
5187b37aca moved multiChoiceProperties where it fits better 2020-05-26 22:50:37 +03:00
Henry Jameson
1f205b87ac lint 2020-05-26 01:06:34 +03:00
Henry Jameson
9d09e4090f multiple fixes 2020-05-26 01:01:25 +03:00
Henry Jameson
83e5ee5494 fix non-mention notifs 2020-05-26 00:22:15 +03:00
Henry Jameson
b5c1d074f8 fix reprööted posts not being muted properly. fix muted posts making
desktop notifications
2020-05-25 23:38:31 +03:00
Henry Jameson
a14635f4f2 oops 2020-05-25 19:57:32 +03:00
Henry Jameson
dc8f78e84d fix for a previous fix 2020-05-25 17:22:57 +03:00
Henry Jameson
101f657d36 improve big spinner visibility 2020-05-25 17:21:05 +03:00
Henry Jameson
ccdbba2348 Change flex for tab switcher lines to always have some small space reserved 2020-05-25 17:18:57 +03:00
Henry Jameson
c0fe39af7a increase gap between buttons in titlebars 2020-05-25 17:15:02 +03:00
Henry Jameson
0eea5c6b80 fix icon changing color 2020-05-25 17:11:30 +03:00
Henry Jameson
500511b415 fix sidebar not closing in mobile 2020-05-25 17:05:30 +03:00
Henry Jameson
534e1fef88 lint 2020-05-25 16:56:32 +03:00
Henry Jameson
5d1b539da2 lint 2020-05-25 16:48:23 +03:00
Henry Jameson
097216c49e remove timeout, was meant for testing 2020-05-25 16:32:32 +03:00
Henry Jameson
bb418bf155 fix tests. user-profile didn't have tab-switcher compnent imported!! 2020-05-25 16:23:14 +03:00
Henry Jameson
0286e1024c fix cursor on desktop, add modal link on mobile 2020-05-25 16:16:30 +03:00
Henry Jameson
7951192cd9 Improve settings-modal async loading, update vue to 2.6.11 to be able
to use Vue.observable, to implmement resettable async component
2020-05-25 16:11:05 +03:00
Henry Jameson
a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
Henry Jameson
79c03984bc scroll to top when switching tabs 2020-05-25 14:16:03 +03:00
Henry Jameson
6a4ad1fe62 added "settings saved" notice back 2020-05-25 14:04:36 +03:00
Ivan Tashkinov
5235e7ea1e Removed with_muted param usage for user favorites timeline endpoint (it only supports pagination params). 2020-05-25 08:48:44 +03:00
Henry Jameson
e7ba4255bb eslint --fix + small fix 2020-05-25 03:43:55 +03:00
Henry Jameson
bcea2e4d12 cleanup 2020-05-25 03:30:14 +03:00
Henry Jameson
138ec85003 Merge remote-tracking branch 'origin/develop' into settings-modal
* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...
2020-05-25 03:29:48 +03:00
Henry Jameson
1e606d2f26 split modal's content into another component, add lazy loading 2020-05-25 03:14:41 +03:00
Henry Jameson
a872c53472 misc fixes 2020-05-24 02:29:09 +03:00
Henry Jameson
ab74cd4972 Multiple fixes for CSS, added proper auth checking 2020-05-24 02:06:55 +03:00