mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-09 19:56:20 +01:00
Code Issues Projects Releases Wiki Activity
14,747 Commits 126 Branches 269 Tags 1 GiB
Commit Graph

1727 Commits

Author SHA1 Message Date
ThibG
98d5ab6be9 [Glitch] Fix spurious error and incorrect state change when adding a reaction twice 
Port c06d2ff43718af5940987e219379094f1a2de180 to glitch-soc

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

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

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

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 10:13:56 +01:00
Thibaut Girka
bdc1581556 Fix emoji button styling in glitch-soc 2020-01-24 16:45:29 +01:00
Eugen Rochko
376e524278 [Glitch] Add announcements 
Port front-end changes from f52c988e12e464e7baefc2fdb48ddf4a95584664 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-24 16:45:29 +01:00
ThibG
4f51fe03c9 [Glitch] Add “account timeline” filter category 
Port JS changes from 43daeccccb31a0145c48f41c4ba449f0a3967ef2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-24 15:27:15 +01:00
ThibG
de76a8969e [Glitch] Fix unfollow confirmations in account directory 
Port ec3ee675640fa441b9113d69b743ee22e107002b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-24 15:25:48 +01:00
Ben Lubar
4417e9e1fd [Glitch] Add transparent support for EventSource streaming. 
Port 619da5a4dc00e51d28b29bfe5230125a78c1fac9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-24 15:25:19 +01:00
Thibaut Girka
dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
 2020-01-20 18:31:11 +01:00
Thibaut Girka
eeb8753adc Add glitch-soc front-end support for many upstream translations 2020-01-20 16:43:18 +01:00
Eugen Rochko
008063d562 [Glitch] Change reported media attachments to always be hidden in admin UI 
Port 1ded3bb752916fe87755d80a832af39431a42438 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-20 15:30:45 +01:00
Sasha Sorokin
7ab12b7654 [Glitch] Correct margins for heading actions 
Port SCSS changes from 5dcca33c561ebeca9cf12eba8a39efee0dd484d0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-12 16:05:09 +01:00
Sasha Sorokin
32191267a5 [Glitch] Use heading actions and placeholders in settings 
Port SCSS changes from 36426ed4ad450320f4a4e598c41355a6d8faad66 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-12 16:04:42 +01:00
Thibaut Girka
180f138394 Make prepending “re: ” to CWs on reply optional 2020-01-07 19:05:31 +01:00
ThibG
5636c94fe9 [Glitch] Fix reuse of detailed status components 
Port 12a9813a0cc269d7b7c72095e279f70ddb7bec6e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-07 16:30:53 +01:00
Takeshi Umeda
83359fef2b [Glitch] Fix shortNumberFormat to within 3 chars without units 
Port 0e8c0287d01d270238aeb7f25c6337b2bcb8afba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-04 23:04:52 +01:00
ThibG
dace054c06 [Glitch] Fix manual scrolling issue on Firefox/Windows 
Port dc0750abc331749a92ffa96fed9fe048acdea3b1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-19 14:43:47 +01:00
Sasha Sorokin
7d2b1dc094 [Glitch] Improve report page structure 
Port 34aa5c7cb2090bf9d995eafdfbf5f9bd01336491 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-19 14:37:12 +01:00
Thibaut Girka
66ab1f83b0 Fix various issues caused by wrong unread key being updated 2019-12-17 15:55:10 +01:00
Thibaut Girka
6a1b4c3452 Fix edit filter link in filtered “Show why” dialog 2019-12-12 16:32:47 +01:00
Thibaut Girka
49027ee948 Fix erroneous inclusion of upstream code 2019-12-07 15:53:04 +01:00
Hinaloe
d4c22d48df [Glitch] Highlight border when focusing poll-form footer 
Port eb551c480d4c687d75d6bc94915adfcd8aae93fb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Takeshi Umeda
510e527663 [Glitch] Add basic support for group actors 
Port f43f1e01840cd0bad7a88c90d9ea44b183a2a15d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
c6ba870f00 [Glitch] Fix poll options not being selectable via keyboard 
Port c05ed8a6254bc82fda3ae0fd3934dc2cdcf7c82d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
1e1293e3c8 [Glitch] Add follow_request notification type 
Port 911cc144815babf83ddf99f2daa3682021d401b8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Shlee
176f1da267 [Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2 
Port f92ed32df4489210ab0ef557f1df90bc5e97d8e6 to glitch-soc

Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 12:54:27 +01:00
Eugen Rochko
fae7e0cace [Glitch] Fix conversations not having an unread indicator in web UI 
Fix ed73376f1ca7ef5e254a3ec21e1ead85b2d34fd6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-01 12:21:55 +01:00
ThibG
2f8c4c588b [Glitch] Fix lost focus when modals open/close 
Port 35b142a7ad19821483f900e81e915a7925fd4eaf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-01 12:19:06 +01:00
Sasha Sorokin
b509b8812a [Glitch] Fix counter sizing 
Port b532ead798c481fd03be9eb78e910d62654cdaa8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:52:12 +01:00
ThibG
776352d329 [Glitch] Add hotkey for opening media files 
Port a690b3e470ed85cc6f3f8fa7aec57d04b60a4705 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:52:12 +01:00
ThibG
949b37faba [Glitch] Fix pending upload count not being decremented on error 
Port 667708f5b00ee8b7795eacd9c20d29f77c8ae602 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:37:16 +01:00
ThibG
7ce7575549 [Glitch] Fix OCR with delete & redraft 
Port e7a7f88df7a763be6dad3a982829ef5a1b1dea09 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:36:49 +01:00
Thibaut Girka
93b8aec7b7 Link move target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
93cb162d4a Show acct of target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
014c2cad21 Add moved account warning 2019-11-27 17:37:01 +01:00
ThibG
271b2e68f3 [Glitch] Fix blur behind closed registration message 
Port SCSS changes from 42b3b019e01ee0c290a510483a2400e85cc250f1 to glitch flavour

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:08:46 +01:00
ThibG
962f485423 [Glitch] Change media description label to be context-sensitive 
Port e86234b1e90975de6e507a86549f0eb4600c723b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:07:23 +01:00
ThibG
64225f4ac2 [Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines 
Port 0d6da8892a675962f8e7fe1f1edc960c4a0ce36d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-20 17:56:35 +01:00
Thibaut Girka
2c6d8ebf02 [Glitch] Minor improvements to poll composing UI 
Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc
 2019-11-07 14:43:07 +01:00
ThibG
44acac0dcd [Glitch] Fix WebUI allowing to upload more items than the limit 
Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-07 14:31:53 +01:00
Thibaut Girka
84a27a08df [Glitch] Fix notification message for own poll 
Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc
 2019-11-06 15:06:53 +01:00
Nolan Lawson
ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages 
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:59:57 +01:00
ThibG
734181c3bf [Glitch] Fix filtered out items being counted as pending items 
Port 3db3c107629a96c60657a615d186e32bb8a5476a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:55:12 +01:00
Gabriel Rubens
d76ab55608 [Glitch] Use inert polyfill 
Port 3cc9ff872f676d7ce56f7cf7875f85f804ea20a9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:52:22 +01:00
ThibG
ea55f70f97 [Glitch] Add support for submitting media description with ctrl+enter 
Port 7488a9e1547733a750160b202942c21f27ffeff2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:50:54 +01:00