mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-10 12:16:23 +01:00
Code Issues Projects Releases Wiki Activity
14,199 Commits 126 Branches 269 Tags
Commit Graph

1683 Commits

Author SHA1 Message Date
Eugen Rochko
648cf8bfd5 [Glitch] Add custom closed registrations message to landing page when set 
Port SCSS changes from 55a9658ad8552804c7c585df12d46c391b84dd94 to glitch-soc
 2019-03-26 16:01:59 +01:00
ThibG
8b5b686f08 [Glitch] Add support for custom emojis in poll options 
Fixes #956

Port 80f0910e2141b24082b9143266a9a6cf1ef6a516 to glitch-soc
 2019-03-20 17:34:32 +01:00
ThibG
803c350ef5 [Glitch] Reduce padding around logo on landing page 
Port 158c31b9df538691666e5b91f48a0afecd2985fe to glitch-soc
 2019-03-20 14:54:52 +01:00
Eugen Rochko
4d01d9c46f [Glitch] Add Keybase integration 
Port SCSS changes from 9c4cbdbafb0324ae259e10865b90ed1ed0255bdd to glitch-soc
 2019-03-20 14:54:19 +01:00
Eugen Rochko
2a93c88015 [Glitch] Disable real-time updates on public pages to improve readability 
Port 42c581c45853cf08f2c9c521d59a2194ef2d9c61 to glitch-soc
 2019-03-20 14:51:25 +01:00
Eugen Rochko
841b920af5 [Glitch] Fix relationship manager on narrow screens 
Port 7130d6e51291b08df59f9580c7d6e1c1d97e7dad to glitch-soc
 2019-03-18 18:07:03 +01:00
ThibG
200cd3b5a7 [Glitch] Save quick filter settings when selecting a different filter 
Port 7477db7268f2a4c158e5f7683493a728d632f7e2 to glitch-soc
 2019-03-18 18:06:26 +01:00
Nolan Lawson
49bea8c46b [Glitch] fix: update to emoji-mart 2.10.0 
Port db06b25376ac7e844e86fb9890fa9f1c2edd2d60 to glitch-soc
 2019-03-16 21:39:13 +01:00
Eugen Rochko
e900b03e38 [Glitch] Fix scrollbar styles on compose textarea, small bugs 
Port 6a3f08661f8d23e5f93717f36df1463842bfd936 to glitch-soc
 2019-03-16 21:07:50 +01:00
Thibaut Girka
0fbe90e2d3 Fix settings/flavours 
Update theming system to use new paths for media files
 2019-03-16 16:21:20 +01:00
Eugen Rochko
47c8707f01 [Glitch] Add relationship manager UI 
Port SCSS changes from 1c113fd72df18999de1d6f09fa3790dd1f715506 to glitch-soc
 2019-03-16 14:36:29 +01:00
Eugen Rochko
338f1327e9 [Glitch] Admission-based registrations mode 
Port SCSS changes from 51e154f5e87968d6bb115e053689767ab33e80cd to glitch-soc
 2019-03-14 17:54:44 +01:00
Eugen Rochko
d8b43f4bd6 [Glitch] Improve invites list with click-to-copy inputs 
Port 6e3936aa6f4296ac202b54c0b178b4fa825d7885 to glitch-soc
 2019-03-14 17:44:39 +01:00
ThibG
931ecc8824 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Eugen Rochko
387f253f31 [Glitch] Add muted style for polls in web UI 
Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko
458db4333a [Glitch] Fix public timeline page not paginating correctly 
Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko
bbb9ff0e84 [Glitch] Redesign landing page 
Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
 2019-03-13 15:53:00 +01:00
Thibaut Girka
a1c6e6de1b Remove leftover console.log 2019-03-11 14:39:45 +01:00
Thibaut Girka
4849eb8e7f Make clicking on the account and status column headers scroll to top 2019-03-11 14:19:16 +01:00
ThibG
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-11 13:23:54 +01:00
Thibaut Girka
9c620fc5c8 [Glitch] Add support for poll ending notifications 
Port front-end parts of 3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc
 2019-03-11 13:08:21 +01:00
ash lea
f534f4869e add local setting to auto reveal media behind cw 2019-03-11 12:14:45 +01:00
Kirishima21
1bf035fb67 fix poll fotter layout 
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
 2019-03-11 12:09:30 +01:00
Eugen Rochko
ca45198ccb [Glitch] Fix NaN in Poll component 
Port 75cb93676b1dd41d3e47f62466c0c6430691a990 to glitch-soc
 2019-03-08 01:01:19 +01:00
Eugen Rochko
6fe48dd050 [Glitch] Fix public timelines being broken by new toots when they are not mounted 
Port be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc
 2019-03-08 01:00:14 +01:00
Thibaut Girka
84c807a0dc Allow setting whether this is a single choice poll or multiple choices one 2019-03-06 23:56:53 +01:00
Thibaut Girka
cb6e351f4d Disable file upload when there is a poll 2019-03-06 23:56:53 +01:00
Thibaut Girka
235be596bc Use server-provided poll limits instead of hardcoded ones 
Also does not enable polls if no limits are provided by the server
 2019-03-06 23:56:53 +01:00
Thibaut Girka
8fe86cebaa [Glitch] Port polls creation UI from upstream 2019-03-06 23:56:53 +01:00
ThibG
6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled 
Port b3668a79eca2d185ea57a9ffc2fa012db52e49f0 to glitch-soc
 2019-03-06 22:40:17 +01:00
Thibaut Girka
1bb23100b1 Add an icon to highlight polls behind a Content Warning 2019-03-06 13:01:27 +01:00
Eugen Rochko
94a0149ff3 Fix poll options not rendering text after vote/refresh 
Port fd128b9c7aa5c71adbfc2e223212514c0baee675 to glitch-soc
 2019-03-06 11:44:27 +01:00
Eugen Rochko
94f1a751bf Avoid line breaks in poll options 
Port 57643557b64bc1853c4aeb65fc652dac3467fa18 to glitch-soc
 2019-03-06 11:43:14 +01:00
Eugen Rochko
7f32d675b0 Render unicode emoji in polls using emoji pack 
Port 4407f07014096bcbaf5a06015a5791984282846d to glitch-soc
 2019-03-06 11:42:25 +01:00
Thibaut Girka
e80fabfd84 Fix toots opening in dynamic column when trying to interact with them 
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
 2019-03-06 00:20:43 +01:00
Thibaut Girka
ff827c1f38 [Glitch] Perform deep comparison for card data when receiving new props 
Prevents embedded players from resetting when interacting with the toot
 2019-03-05 23:22:29 +01:00
Eugen Rochko
ba6ca3cd69 Fix various issues in polls 
Port front-end changes from a198add83bb527c32fa0e01404338562b157da99 to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG
7f27ee35a8 Display closed polls as such 
Port cda6ece760f08974e6118887641e6cc8c0f8c9e0 to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG
530151466e Fixes to the polls UI 
Port 4ced609497bc736cb2b1aec921ba5ca7a23a7f53 to glitch-soc
 2019-03-05 21:35:03 +01:00
Eugen Rochko
f14eda23e9 Fix web UI crash on page load when detailed status has a poll 
Port 5dfa4336985616cf5652de2f1cf794d8f740424e to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG
2156765448 Insert polls in redux stores before statuses so it avoids crashes 
Port 26c56d0c10ca036291d8b08b34f971f981217e8c to glitch-soc
 2019-03-05 21:35:03 +01:00
Eugen Rochko
8d70a8a19b Add polls 
Port front-end parts of 230a012f0090c496fc5cdb011bcc8ed732fd0f5c to glitch-soc
 2019-03-05 21:35:03 +01:00
Thibaut Girka
0d19fcc2fb Port upstream refactoring of reducers and actions 
Also includes 9e45b051cfea667f9ca3d3c72d13022259315090
 2019-03-05 21:35:03 +01:00
Eugen Rochko
cce1c3252f Fix home timeline perpetually reloading when empty 
Port 3e0ed36e8ede7f1994ab9c46c4cb86e613569440 to glitch-soc
 2019-03-05 19:30:11 +01:00
Mélanie Chauvel (ariasuni)
2a4ce7458a [Glitch] Fix errors found by eslint 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
282ac61500 [Glitch] Make the column header of profile view look like the others, too 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
12a0dd71be [Glitch] Make the column header of toot/thread view look like the others 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Thibaut Girka
76ed481aa7 Port public page mastodon-light fixes from upstream 2019-02-27 16:24:57 +01:00
Eugen Rochko
1e06ca1c0a Fix web UI not removing notifications after block (#10108) 
Regression from #7311
 2019-02-26 19:33:59 +01:00
abcang
7209a8b32f Keep notification when muting_notifications is true (#7311) 
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
 2019-02-26 19:33:42 +01:00