djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,822 Commits 69 Branches 20 Tags 356 MiB
Commit Graph

823 Commits

Author SHA1 Message Date
Eugen Rochko 387f253f31 [Glitch] Add muted style for polls in web UI 
Port 5b50c2cbaa to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko 458db4333a [Glitch] Fix public timeline page not paginating correctly 
Port da45b8b4c9 to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko bbb9ff0e84 [Glitch] Redesign landing page 
Port 65fffeac3f 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 3a92885a86 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 75cb93676b 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 be1c634b2b 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 b3668a79ec 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 fd128b9c7a to glitch-soc
 2019-03-06 11:44:27 +01:00
Eugen Rochko 94f1a751bf Avoid line breaks in poll options 
Port 57643557b6 to glitch-soc
 2019-03-06 11:43:14 +01:00
Eugen Rochko 7f32d675b0 Render unicode emoji in polls using emoji pack 
Port 4407f07014 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 a198add83b to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG 7f27ee35a8 Display closed polls as such 
Port cda6ece760 to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG 530151466e Fixes to the polls UI 
Port 4ced609497 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 5dfa433698 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 26c56d0c10 to glitch-soc
 2019-03-05 21:35:03 +01:00
Eugen Rochko 8d70a8a19b Add polls 
Port front-end parts of 230a012f00 to glitch-soc
 2019-03-05 21:35:03 +01:00
Thibaut Girka 0d19fcc2fb Port upstream refactoring of reducers and actions 
Also includes 9e45b051cf
 2019-03-05 21:35:03 +01:00
Eugen Rochko cce1c3252f Fix home timeline perpetually reloading when empty 
Port 3e0ed36e8e 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
Thibaut Girka d82de360c1 Fix non-numeric account identifiers leading to /web/accounts/NaN 
I'm not sure what purpose these “+” served?!
 2019-02-22 17:52:21 +01:00
Thibaut Girka 896beb16c5 [Glitch] Internationalize unexpected error message 
Port 4e71b104e6 to glitch-soc,
fixing a crash in the process
 2019-02-18 19:49:06 +01:00
Eugen Rochko be9352266c Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-18 18:16:35 +01:00
Thibaut Girka d974988541 Fix video player width not being updated to fit container width 2019-02-18 10:44:37 +01:00
Ben Lubar fa9635c741 Allow multi-line image descriptions. (Glitch) 2019-02-17 15:19:12 +01:00
Thibaut Girka e31fc2b458 [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 041ff5fa9a to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka 91c9cb6022 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 71e28ba399 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka 9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
 2019-02-17 12:26:55 +01:00
Eugen Rochko 59fa38a4f6 Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka a151c5566a [Glitch] Fix hashtags select styling in default and high contrast skins 
Port 169b9d4428 to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko 4dcb04b888 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka 2769b54466 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Thibaut Girka 614ea184bb [Glitch] Add "copy link" item to status action bars 
Port 3cfadd875c to glitch-soc
 2019-02-13 07:29:57 +01:00