tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,569 Commits 5 Branches 0 Tags
Commit Graph

1385 Commits

Author SHA1 Message Date
ThibG
a08a2130f0 [Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists 
Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-12 17:01:41 +02:00
Thibaut Girka
51bbf0b68d Clean up some dead code 2020-04-10 14:47:06 +02:00
Thibaut Girka
5d2cdeb225 Fix deprecated use of createBrowserHistory 2020-04-09 17:03:05 +02:00
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 d3ff06a3205130fa10ffc5d736e8206a9725b5df 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 f65568f1d400be2e101bd8b533a1b53807f5c757 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 37b3985bfac5ffdc8e452f92869dcdefb5c92594 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 1fb92037e432913902a5e5c8a5b673b036d84cb8 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 cf1fa73347c9ca2b1c4f14521e990feba7509e2e 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 be2f1597cf6b010a7ea0ffdc45550f87a7ae9dad  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 0d117c106aa72f78dd5cdd371849dd8ce3120198 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 858d0dd168b737a77506d6aa00f6ed582d0e33c6 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 beb80adb5150e50717852b39db7b534bc0da9534 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 8758221e7344645bc1357578ec1789aa7d46da08 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 90f3a0006243250ced6e7e192f81513d6b731b33 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 310d729745ad34b1b039f2ec611b9bda5b73f252 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 9660aa4543deff41c60d131e081137f84e771499 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 aa67036b41d37935210c8b5094ac20c153a62011 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 5e4b6496557b5ef167518dbc6015307158e30ccf 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 fd76955f3942bbd7ec830ab535bc31621cac14a4 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 4063f9f27805de0a12904071e521094122b9f725 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 2e18b1a2a2976f04f84e92d187b0620223a64fa6 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 503eab1c1f101e92f163ed4f8457cac9a6193ffc 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 e69a3f54a10e58d32d7e46c494d98be948dde4b3 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 39453de232e068f58a711b2c052fe74fdd0c40b6 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 036ba3f51065a96cb9203a9ac5aa71d7d6edeebe 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 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 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 ff3a11d01d262c0a37cc1e33db2013b19729fb9d 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 1314bba68a5f2d271312bad08f108e1ff56c2c00 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 90f04ea06425d5774c200818caf08219c172b6f8 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 02236332bab7c5cc4ddf4a3a778fd956f6851322 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 c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 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 5711899c59147252a01e21371994ca6a60418628 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 3adc722d1cdd28d87d2724b8952d7ec52d241b52 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 50cd73e5d7e39600203c9c3f591f04289f41e297 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 bba0269d9741c8c4daaa9048c265a1321d93fbba 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 305abc9e05ddb2db6a40a6eda01578e01e58791f 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 0fcc4b1c566e4365e07ce5a1c87743db76c07fe6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-28 19:17:06 +01:00