treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
11,446 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

1368 Commits (99fc46d0233b42362a5542101421dbcc5181d2e4)

Author SHA1 Message Date
Thibaut Girka 99fc46d023 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 e16832bc9c Fix missing media description dialog when sending toots with keyboard shortcuts 2020-03-14 14:59:14 +01:00
Thibaut Girka 03309b0dc5 Fix posting privacy on secondary button with missing description confirmation dialog 2020-03-14 12:33:50 +01:00
Thibaut Girka 9af4ed237c Fix privacy icon being displayed twice in glitch-soc Web UI 
Fixes #1298
 2020-03-11 23:25:15 +01:00
ThibG 96df38d753 [Glitch] Add support for links to statuses in announcements to be opened in web UI 
Port a67fd2fbe1 to glitch-soc

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:45:36 +01:00
Bèr Kessels 96b18a705f [Glitch] Code style improvements in JavaScript 
Port b5d7ec71ef 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) ce8d13d2fb [Glitch] Change description of privacy levels to be more intuitive in web UI 
Port 263bedff9e 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) 5325a14430 [Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI 
Port 38a26d5314 to glitch-soc

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

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

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-25 14:30:43 +01:00
Thibaut Girka c4b1ae964b Document alt+enter 2020-02-22 23:07:29 +01:00
Thibaut Girka b4be41e4c4 [Glitch] Add source-mapped stacktrace to error message in web UI 
Port 729fe5bfd6 to glitch-soc
 2020-02-19 23:31:15 +01:00
ThibG 2f977ac8f3 [Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI 
Port 3cdaa34783 to glitch-soc

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:03:24 +01:00
Eugen Rochko c7cdca7afb [Glitch] Fix link colors in announcements 
Port 3ae0b03603 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:01:46 +01:00
Eugen Rochko a20b14b6b4 [Glitch] Add streaming API updates for announcements being modified or deleted 
Port dd68e44cfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 16:01:06 +01:00
ThibG 042964971f [Glitch] Fix status overflowing in report dialog 
Port 8f37f20ff9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 15:59:25 +01:00
Thibaut Girka 9f924a3283 Refactor notifications cleaning mode 2020-01-26 14:55:03 +01:00
ThibG f6b0fc204d [Glitch] Fix “new items glow” being displayed above settings and announcements 
Port 234f1be486 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 20:05:36 +01:00
ThibG 2b7a2e2b7a [Glitch] Fix spurious error and incorrect state change when adding a reaction twice 
Port 1c85e84b4e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 19:53:04 +01:00
ThibG 17b9f1efb7 [Glitch] Improve announcements design 
Port ab01849287 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 16:57:03 +01:00
Eugen Rochko 8caa94f566 [Glitch] Add limit of 8 different reaction types per announcement 
Port 150c13c4e0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:36:27 +01:00
Eugen Rochko ac320c111c [Glitch] Add number animations 
Port 8ca6f2d3b2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:36:27 +01:00
Eugen Rochko c97d41eada [Glitch] Change font size of announcements to be the same as statuses 
Port b169901439 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:21:13 +01:00
Sasha Sorokin 481b2e5df4 [Glitch] Fix unlocalized dropdown button title 
Port 51f376aee3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:20:05 +01:00
Thibaut Girka 4c312ad79d Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream 2020-01-25 10:17:13 +01:00
Ben Lubar cac596b275 [Glitch] minor server-sent events fixes 
Port front-end changes from 6598ab989b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:13:56 +01:00
Thibaut Girka 17f0a69cc8 Fix emoji button styling in glitch-soc 2020-01-24 16:45:29 +01:00