hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4780 commits 4 branches 0 tags 44 MiB
Commit graph

4780 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
4e8499abad Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (38 commits)
  give notification timeago a min width
  streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff
  corrected tos.html location
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (Finnish)
  Apply suggestion to src/components/staff_panel/staff_panel.js
  StaffPanel: Move staff loading to panel creation.
  Apply suggestion to src/boot/after_store.js
  fix preview opening automatically
  After Store: Correctly handle preloaded HTML
  remove console log
  fix issue on posting another status
  remove unnecessary code
  add more ways to set description
  fix edge case of videos and unknown files together
  fix modal types check being broken
  don't close preview on post, move visibility notices above the preview where they belong
  remove contenttype check from content type watcher
  ...
 2020-07-08 20:03:52 +03:00
HJ
2b3c4ccfae Merge branch 'fix/notifications-jumping-based-on-time' into 'develop' 
Fix notifications (favs and rts) jumping based on timeago width

See merge request pleroma/pleroma-fe!1175
 2020-07-08 12:57:31 +00:00
Shpuld Shpuldson
60921be5a0 give notification timeago a min width 2020-07-08 14:11:42 +03:00
Shpuld Shpludson
a0ddcbdf5b Merge branch 'patch-1' into 'develop' 
corrected tos.html location

See merge request pleroma/pleroma-fe!1173
 2020-07-08 10:18:28 +00:00
lain
4f96418143 Merge branch 'wyatt777/pleroma-fe-issue-353' into 'develop' 
Allow remove of banner, avatar images issue #353 v2

See merge request pleroma/pleroma-fe!1156
 2020-07-08 10:11:17 +00:00
Shpuld Shpludson
eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
Dym Sohin
1767ee01d0 corrected tos.html location 2020-07-07 19:34:45 +00:00
Shpuld Shpludson
7206fee437 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1169
 2020-07-07 13:03:12 +00:00
Ben Is
0ab6d92ab8 Translated using Weblate (Italian) 
Currently translated at 85.2% (545 of 639 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2020-07-07 12:53:55 +00:00
Ben Is
a6606df01a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 88.2% (564 of 639 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
 2020-07-07 12:53:55 +00:00
Ben Is
5b48954644 Translated using Weblate (Italian) 
Currently translated at 75.1% (480 of 639 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2020-07-07 12:53:55 +00:00
Ben Is
e9be206a65 Translated using Weblate (Finnish) 
Currently translated at 95.4% (610 of 639 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
 2020-07-07 12:53:55 +00:00
Shpuld Shpludson
8f87a36a5a Merge branch '884-about-panel-optimizations' into 'develop' 
StaffPanel: Move staff loading to panel creation.

Closes #884

See merge request pleroma/pleroma-fe!1171
 2020-07-07 12:53:49 +00:00
Shpuld Shpludson
7d881d97fe Apply suggestion to src/components/staff_panel/staff_panel.js 2020-07-07 12:44:29 +00:00
lain
431b3f527d StaffPanel: Move staff loading to panel creation. 2020-07-07 14:39:43 +02:00
Shpuld Shpludson
ec26ff04ce Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' into 'develop' 
media description authoring v3

See merge request pleroma/pleroma-fe!1161
 2020-07-07 12:14:58 +00:00
Shpuld Shpludson
0fe5d4cf10 Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring' 
# Conflicts:
#   src/components/post_status_form/post_status_form.js
 2020-07-07 12:05:30 +00:00
Shpuld Shpludson
bbb977a044 Merge branch '885-fix-preloading-html' into 'develop' 
After Store: Correctly handle preloaded HTML

Closes #885

See merge request pleroma/pleroma-fe!1170
 2020-07-07 11:59:36 +00:00
lain
7c9ba8995c Apply suggestion to src/boot/after_store.js 2020-07-07 11:47:01 +00:00
Shpuld Shpuldson
f7f8181dcf fix preview opening automatically 2020-07-07 14:46:53 +03:00
lain
1f97f36e1c After Store: Correctly handle preloaded HTML 2020-07-07 13:17:25 +02:00
Shpuld Shpuldson
97c62587d0 remove console log 2020-07-07 11:34:40 +03:00
Shpuld Shpuldson
84d728b970 fix issue on posting another status 2020-07-07 11:31:24 +03:00
Shpuld Shpuldson
e3991db5c4 fix conflicts and add error handling to media descriptions 2020-07-07 10:01:37 +03:00
Shpuld Shpuldson
f4bdbf7691 remove unnecessary code 2020-07-07 09:08:50 +03:00
Shpuld Shpuldson
b4709f93d4 add more ways to set description 2020-07-07 09:07:20 +03:00
Shpuld Shpuldson
d55c09df18 fix edge case of videos and unknown files together 2020-07-06 15:06:13 +03:00
Shpuld Shpuldson
87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Shpuld Shpuldson
4d25be7cb3 fix modal types check being broken 2020-07-06 13:42:33 +03:00
Shpuld Shpludson
9ccc6174a7 Merge branch 'feat/rich-text-preview' into 'develop' 
Status preview #459

See merge request pleroma/pleroma-fe!1159
 2020-07-06 10:17:26 +00:00
Shpuld Shpuldson
ada5a3806b don't close preview on post, move visibility notices above the preview where they belong 2020-07-06 11:36:35 +03:00
Shpuld Shpuldson
7bdc3d6ce9 remove contenttype check from content type watcher 2020-07-06 11:12:33 +03:00
Shpuld Shpuldson
f254a847d2 move translation strings to correct place, translate error message 2020-07-06 10:53:03 +03:00
Shpuld Shpuldson
105254d73d Merge branch 'feat/rich-text-preview' of git.pleroma.social:pleroma/pleroma-fe into feat/rich-text-preview 2020-07-06 10:46:23 +03:00
Shpuld Shpuldson
afdc3f96f0 fix conflicts, make subject update the preview 2020-07-06 10:45:47 +03:00
Henry Jameson
7d81d11338 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (41 commits)
  Apply suggestion to src/components/notifications/notifications.js
  fix height for emoji panel of settings modal
  Add bookmarks
  FE part of BE issue 1586 provide index md
  change alert popup alpha
  add follow request users to store
  make the addNotice dispatch return the notice
  change storage error one-off into a global notice system
  remove accidental log
  revert accidental change in instance.js
  update the message and changelog
  catch localforage error and let the application work, add an alert for user to dismiss
  document the 'mark-as-read-detection' system
  allow overscrolling enough to not have FAB block interactables
  add initial fetching back in a more streamlined way
  remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch
  change Show New text to Reload when flushing
  Make use of backend reply filtering
  update changelog for reply-to strikethrough
  add no-statusId support for status popover
  ...
 2020-07-05 15:46:34 +03:00
Shpuld Shpludson
b761bcf333 Merge branch 'fix/remove-extra-notifications-fetch' into 'develop' 
Fix: notifications fetcher double fetching on every tick

See merge request pleroma/pleroma-fe!1164
 2020-07-05 07:03:27 +00:00
Shpuld Shpludson
9178908c1e Apply suggestion to src/components/notifications/notifications.js 2020-07-05 06:54:12 +00:00
Shpuld Shpludson
af4a26b588 Merge branch 'feat/allow-use-without-cookies' into 'develop' 
Fix #815: Allow use without cookies, Add a global notice popup system

Closes #815

See merge request pleroma/pleroma-fe!1166
 2020-07-05 06:53:29 +00:00
Shpuld Shpludson
acc3b083aa Merge branch 'feat/parent-visible-support' into 'develop' 
#874 Add strike-through to "Reply to" when parent_visible is set to false

See merge request pleroma/pleroma-fe!1162
 2020-07-05 06:15:35 +00:00
HJ
5b8875e3d8 Merge branch 'fix-emoji-panel-height' into 'develop' 
Fix emoji panel for settings modal

See merge request pleroma/pleroma-fe!1168
 2020-07-04 23:53:39 +00:00
HJ
b448871d23 Merge branch 'fix/allow-over-scrolling-on-bottom-mobile' into 'develop' 
Fix #854: allow overscrolling enough to not have FAB block interactables

Closes #854

See merge request pleroma/pleroma-fe!1165
 2020-07-04 20:41:54 +00:00
kPherox
9b40cf43d8
fix height for emoji panel of settings modal 2020-07-04 18:42:15 +09:00
Shpuld Shpludson
76de4a3132 Merge branch 'bookmarks' into 'develop' 
Bookmarks

Closes #472

See merge request pleroma/pleroma-fe!903
 2020-07-03 19:45:49 +00:00
Eugenij
de291e2e33 Add bookmarks 
Co-authored-by: jared <jaredrmain@gmail.com>
 2020-07-03 19:45:49 +00:00
lain
7bd89b579f Merge branch 'fix_BE_1586_provide_index_md' into 'develop' 
FE part of BE issue 1586 provide index md

See merge request pleroma/pleroma-fe!1154
 2020-07-03 10:17:42 +00:00
Ilja
08b593746f FE part of BE issue 1586 provide index md 
* I added an index.md which will be the landing page for the docs. It has an explanation of Pleroma-FE from the user point of view
* See also BE MR: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2669
* And issue: https://git.pleroma.social/pleroma/pleroma/-/issues/1586
 2020-07-03 10:17:42 +00:00
Shpuld Shpuldson
9cac5d94dd change alert popup alpha 2020-07-02 15:17:58 +03:00
Shpuld Shpuldson
150516df4e Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' of git.pleroma.social:pleroma/pleroma-fe into xenofem/pleroma-fe-rebased-image-description-authoring 2020-07-02 14:31:07 +03:00
Shpuld Shpuldson
b8ed904c0c change px to em 2020-07-02 14:28:35 +03:00