Commit Graph

4427 Commits

Author SHA1 Message Date
lain
fd109fa355 Merge branch 'develop' into 'chore/improve-default-tos'
# Conflicts:
#   static/terms-of-service.html
2020-06-12 14:17:56 +00: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
Shpuld Shpludson
48365819d1 Merge branch 'depatchou' into 'develop'
Remove pizza

See merge request pleroma/pleroma-fe!1143
2020-06-11 17:48:15 +00:00
lain
17b6396333 Update lockfile 2020-06-11 19:11:56 +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
dc7489fd8b Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma-fe!1140
2020-06-11 14:00:24 +00: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
lain
4acac3c38c Merge branch 'fix/attachment-sizing-cover-fix' into 'develop'
Fix attachment cover/contain again

See merge request pleroma/pleroma-fe!1141
2020-06-11 12:48:38 +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
lain
23b7424913 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma-fe!1121
2020-06-10 11:13:29 +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 Shpludson
02ba992476 Merge branch 'feat/drag-and-drop-improovements' into 'develop'
Add visual indication for drag&dropping files, make dropzone bigger

See merge request pleroma/pleroma-fe!1137
2020-06-10 10:27:48 +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
Shpuld Shpuldson
1308fdd3bc update changelog 2020-06-10 11:29:28 +03:00
lain
4f66221adc Merge branch 'half-a-ctrl-press' into 'develop'
Attempt to fix that elusive bug with post being sent on copypaste

See merge request pleroma/pleroma-fe!1138
2020-06-10 08:27:01 +00:00
Henry Jameson
cad42eec2a changelog 2020-06-10 11:20:40 +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
Shpuld Shpludson
951f25707a Merge branch '572-multiple-file-drag-and-drop' into 'develop'
MediaUpload: Allow drag-and-drop of multiple files at once

Closes #572

See merge request pleroma/pleroma-fe!1135
2020-06-08 17:31:40 +00:00
lain
d8211392c4 Apply suggestion to CHANGELOG.md 2020-06-08 17:24:08 +00:00
lain
d5ec269d88 Update changelog. 2020-06-08 19:14:13 +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
HJ
a5de8db579 Merge branch 'settings-modal' into 'develop'
Settings modal

See merge request pleroma/pleroma-fe!1118
2020-06-06 21:24:47 +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