tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
11,540 Commits 20 Branches 113 Tags 222 MiB
9101254d0a
Commit Graph

1382 Commits

Author SHA1 Message Date
Thibaut Girka
9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 2020-04-05 18:32:06 +02:00
ThibG
fd7a37c371 [Glitch] Add explanation as to why unlocked accounts may have follow requests 
Port d3ff06a320 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:59:49 +02:00
Eugen Rochko
7d5b43d8bb [Glitch] Add ability to filter audit log in admin UI 
Port f65568f1d4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:53:31 +02:00
Sasha Sorokin
b367dd713e [Glitch] Improve polls: option lengths & redesign 
Port 37b3985bfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
2e337d850f [Glitch] Improve toot clicking areas 
Port part of 1fb92037e4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:49:43 +02:00
ThibG
9175ebf20c [Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW 
Port cf1fa73347 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port be2f1597cf  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
ThibG
3eede6f64b [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 
Port front-end changes from 0d117c106a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:39:44 +02:00
ThibG
faa56643b8 [Glitch] Fix frontend crash when deleting announcements 
Port 858d0dd168 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:42 +01:00
ThibG
60338b2bee [Glitch] Change poll option hover/active styling to be less confusing 
Port beb80adb51 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:06 +01:00
Daniel Sockwell
9da4bd098c [Glitch] Fix frontend crash when deleting announcements 
Port 8758221e73 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:31:01 +01:00
ThibG
0ff78befc6 [Glitch] Fix regression in “Edit media” modal in web UI 
Port 90f3a00062 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:30:19 +01:00
mayaeh
912f4a2eba [Glitch] Change the string "hidden" to "blocked" in WebUI 
Port 310d729745 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:29:51 +01:00
Eugen Rochko
295dadc9f0 [Glitch] Change local media attachments to perform heavy processing asynchronously 
Port front-end part of 9660aa4543 to glitch-soc

[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:26:26 +01:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 2020-03-22 16:10:44 +01:00
Thibaut Girka
7115b0b8c9 Fix missing media description dialog when sending toots with keyboard shortcuts 2020-03-14 14:59:14 +01:00
Thibaut Girka
531658d6cf Fix posting privacy on secondary button with missing description confirmation dialog 2020-03-14 12:33:50 +01:00
Thibaut Girka
e53622442c Fix privacy icon being displayed twice in glitch-soc Web UI 
Fixes #1298
 2020-03-11 23:25:15 +01:00
ThibG
9c29229587 [Glitch] Add support for links to statuses in announcements to be opened in web UI 
Port aa67036b41 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
669cf49c54 [Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI 
Port 5e4b649655 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:45:36 +01:00
Bèr Kessels
fc53d9cc76 [Glitch] Code style improvements in JavaScript 
Port fd76955f39 to glitch-soc

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:43:53 +01:00
Mélanie Chauvel (ariasuni)
35d2189ac8 [Glitch] Change description of privacy levels to be more intuitive in web UI 
Port 4063f9f278 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:37:13 +01:00
Mélanie Chauvel (ariasuni)
bdb06f50ec [Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI 
Port 2e18b1a2a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:19:08 +01:00
ThibG
3c96a0c21d [Glitch] Fix too large announcements not being scrollable in web UI 
Port 503eab1c1f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:16:43 +01:00
koyu
6211eff739 [Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI 
Port e69a3f54a1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:15:11 +01:00
ThibG
c8f36a71ea [Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI 
Port 39453de232 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
eae96cb204 [Glitch] Add tooltips to audio/video player buttons 
Port 036ba3f510 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 19:59:42 +01:00
ThibG
2f2b48b227 [Glitch] Fix /web redirecting to /web/web in web UI 
Port 0f07218e53 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-25 14:30:43 +01:00
Thibaut Girka
0d41fef506 Document alt+enter 2020-02-22 23:07:29 +01:00
Thibaut Girka
bc4de2f661 [Glitch] Add source-mapped stacktrace to error message in web UI 
Port ff3a11d01d to glitch-soc
 2020-02-19 23:31:15 +01:00
ThibG
c9166a5943 [Glitch] Fix old browsers crashing because of missing finally polyfill in web UI 
Port 1314bba68a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-19 23:10:37 +01:00
Thibaut Girka
955f838f9d Fix clicking on the “TOOT” button send bogus visibility parameter 2020-02-16 00:10:45 +01:00
Thibaut Girka
40798cba41 Fix alt+enter changing visibility setting without sending toot when toot is empty 2020-02-14 22:38:24 +01:00
Thibaut Girka
3d7fd4a2df Fix boosting private toots in detailed view 2020-02-09 22:15:49 +01:00
Eugen Rochko
5f61065e74 [Glitch] Fix unread indicator on announcements not being aligned with text in web UI 
Port 90f04ea064 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-09 12:30:29 +01:00
ThibG
e443874024 [Glitch] Fix native share button not being displayed for unlisted toots 
Port 02236332ba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-09 12:29:51 +01:00
ThibG
fe9a124f5a [Glitch] Fix dates (without time) being rendered as datetimes in public pages 
Port c31d61d7f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-06 21:41:50 +01:00
fuyu
b9aa57d5bf [Glitch] Don't display toggle reveal button in video modal when full screen 
Port 5711899c59 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-06 21:39:26 +01:00
Thibaut Girka
885e9227c6 Fix poll compose form being broken on single-column layout 2020-02-03 11:56:31 +01:00
ThibG
3dcb279da3 [Glitch] Change how unread announcements are handled 
Port 3adc722d1c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-03 09:31:32 +01:00
Sasha Sorokin
dd6149ca0b [Glitch] Add "Show thread" button to public profiles 
Port 50cd73e5d7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-03 09:30:13 +01:00
Eugen Rochko
9dc1f7d299 [Glitch] Fix mascot being too large, and a code style issue 
Port bba0269d97 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-03 09:27:51 +01:00
Thibaut Girka
4cd2d13bd2 When submitting markers, use last displayed notification, not last received one 2020-02-01 19:53:01 +01:00
Thibaut Girka
e135b293fa Fetch last read notification id to update unread notification count on load 2020-02-01 19:53:01 +01:00
Thibaut Girka
cf5b769857 Add support for xmpp: and magnet: URIs to misleading link detection code 2020-01-28 20:25:56 +01:00
Eugen Rochko
8bb5d1abaa [Glitch] Fix design of announcements in admin UI 
Port 305abc9e05 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-28 19:17:47 +01:00
Eugen Rochko
ed5fb51168 [Glitch] Change announcements to be collapsed on page load in web UI 
Port 0fcc4b1c56 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-28 19:17:06 +01:00
Eugen Rochko
cf230d551f [Glitch] Change number animations direction based on decrease or increase 
Port 10e209d8e0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:06:03 +01:00
Eugen Rochko
b0139dcf5e [Glitch] Add animations to announcement reactions 
Port dd4eec6bf6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:05:37 +01:00
ThibG
41d0869d7f [Glitch] Change last_status_at to be a date, not datetime 
Port 42d2a915e4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:03:24 +01:00