fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
14229 commits 135 branches 266 tags 983 MiB
Commit graph

840 commits

Author SHA1 Message Date
Thibaut Girka bfa5bdde2c [Glitch] Place emoji picker top if it is closer to the bottom of the viewport 
Port ad5d3134e4 to glitch-soc
 2018-05-05 16:58:20 +02:00
Thibaut Girka 356d0214c9 Implement tootsuite-style account fields 
glitch-soc-style still in backup, both sharing the same SCSS style
 2018-04-29 18:48:45 +02:00
beatrix f4ed38272b
Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread 
Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour
 2018-04-26 11:34:14 -04:00
Thibaut Girka 240833c023 Fix actions modal on mobile (fixes #441) 2018-04-23 23:18:36 +02:00
Thibaut Girka 64d8d0464d Add show more/less toggle for entire threads in web UI 
Inspired from b6003afcdb but using component
properties instead of redux store for hidden/revealed state.
 2018-04-22 19:19:01 +02:00
Thibaut Girka 2888f74c12 Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic 2018-04-22 19:18:15 +02:00
Thibaut Girka 259bc9840b [Glitch] Fix style of legacy column headers 
Backports daefbd66a6
 2018-04-22 19:17:10 +02:00
beatrix 06fc278e4c
Merge pull request #432 from ThibG/glitch-soc/features/reblog-private 
Glitchsoc-specific changes to allow boosting own private toots
 2018-04-22 12:32:58 -04:00
beatrix 125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior 
Improve ScrollableList behavior
 2018-04-22 12:09:52 -04:00
beatrix cd5728b176
Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video 
Fix video player on toot public views
 2018-04-22 12:09:11 -04:00
beatrix e88ce27855
Merge pull request #435 from ThibG/glitch-soc/features/public-modals 
[Glitch] Show media modal on public pages
 2018-04-22 12:07:29 -04:00
Thibaut Girka e4dff10934 Fix video player on toot public views 2018-04-20 16:08:46 +02:00
Thibaut Girka 7a68079b3f [Glitch] Show media modal on public pages 
Port ff7941e652 to glitch-soc
 2018-04-20 15:58:36 +02:00
Thibaut Girka 694337d9bb Fix auto-collapsed toots making the TL jump (fixes #417) 2018-04-19 11:30:42 +02:00
Thibaut Girka 3068384dbc Glitchsoc-specific changes to allow boosting own private toots 2018-04-19 11:24:29 +02:00
Thibaut Girka 52229405ed [Glitch] Make detailed status' media gallery standalone 2018-04-19 11:16:18 +02:00
Thibaut Girka dcc1c10937 [Glitch] Center thumbnails on focus point 
Port the display part of the following commits to glitch-soc:
* 90f12f2e5a
* b170627ceb
* 11697d6894
* 56eb5c3f34
 2018-04-19 11:16:18 +02:00
ThibG 21837b291e
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks 
Fix the bookmark column pinning fix…
 2018-04-17 11:46:31 +02:00
Thibaut Girka 1aac83ef47 Fix the bookmark column pinning fix… 2018-04-17 11:24:07 +02:00
ThibG 84d0aa7b26
Merge pull request #429 from ThibG/glitch-soc/features/bookmarks 
Fix pinning the bookmarks column (fixes #428)
 2018-04-16 23:24:51 +02:00
Thibaut Girka 54f5170f59 Fix pinning the bookmarks column (fixes #428) 2018-04-16 22:52:45 +02:00
Thibaut Girka 5d96c5ac41 [Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI 
Port the video-player part of 036dd98abb to
glitch-soc. MediaGallery part ignored since it has diverged quite a bit.

This fixes #423
 2018-04-14 17:35:45 +02:00
Thibaut Girka c5dd4ed1d5 [Glitch] Fix media button type 
Port ecdac9017e to glitch-soc
 2018-04-14 12:30:55 +02:00
Thibaut Girka dfe8abb8cd [Glitch] Handle preference to always display sensitive media 
Port the UI part of 76f3d5d16b to glitch-soc
 2018-04-14 12:27:14 +02:00
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks 
Bookmarks
 2018-04-13 16:38:15 -05:00
David Yip eb72c3398c
Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns 
Place composer dropdown menus top if they are closer to the bottom of the viewport
 2018-04-12 03:28:22 -05:00
David Yip 0b326950bf
Merge pull request #416 from ThibG/glitch-soc/features/media-modal 
Port various media modal improvements to glitch-soc
 2018-04-12 00:20:19 -05:00
Thibaut Girka acb434b0c9 Add glitch-soc front-end support for bookmarks 
Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it.
 2018-04-11 21:05:34 +02:00
Thibaut Girka e74e5c7eb9 Place composer dropdown menus top if they are closer to the bottom of the viewport 2018-04-10 20:52:31 +02:00
Thibaut Girka 0fb5ea5d15 Fix video modal 2018-04-09 00:11:10 +02:00
Thibaut Girka a4fa8c9064 [Glitch] Avoid using JS to set height in MediaModal 
Port fa5c867e0e to glitch-soc
 2018-04-08 23:18:24 +02:00
Thibaut Girka 87071d9e81 [Glitch] Improved media modal 
Port 4e929b2d17 to glitch-soc
 2018-04-08 23:15:25 +02:00
Thibaut Girka 0b86ec4e7f [Glitch] Allow to open a modal for embedded photo 
Port bf7757cbbc to glitch-soc
 2018-04-08 23:06:33 +02:00
Thibaut Girka a896f601fa Fix video playback in glitch-soc detailed statuses 2018-04-08 12:22:12 +02:00
Thibaut Girka ca9f022a80 [Glitch] Fix: Prevent submission using same logic as submit button disabling. 
Port 6a895e1ab3 to glitch-soc
 2018-04-02 20:04:18 +02:00
beatrix 3304cb681d
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 
Port #6628 to glitch-soc flavour
 2018-03-30 14:50:02 -04:00
Thibaut Girka 48bcf4d6e8 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 913a38111f to glitch-soc
 2018-03-30 12:45:23 +02:00
Thibaut Girka 218cc261d1 Add the domain blocks UI to Getting Started Misc 2018-03-30 10:07:33 +02:00
Thibaut Girka afa813d71f Add basic domain block UI 2018-03-30 10:07:33 +02:00
Thibaut Girka 79da0ad7a2 Update all known users' domain_blocking relationship instead of just one's 2018-03-30 10:07:33 +02:00
Thibaut Girka b5948044b3 [Glitch] Display unfollow button even if account moved 
Backport 3987bd18a4 to glitch-soc
 2018-03-29 14:59:20 +02:00
Thibaut Girka a59c146bf8 [Glitch] Profile redirect notes 
Port WebUI changes from 58cede4808
 2018-03-29 14:59:20 +02:00
David Yip a387f99659
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots 
Port WebUI toots/with reply/media tabs and pinned toots to glitch
 2018-03-18 20:17:15 -05:00
Thibaut Girka 6f0e50f9a0 [Glitch] Federate pinned statuses over ActivityPub 
Port 9110db41c5 to glitch
 2018-03-16 23:16:20 +01:00
Thibaut Girka f00af46d70 [Glitch] Add "Toots/Toots with replies/Media" tab below profile header 
Port 5131012505 to glitch
 2018-03-16 23:16:20 +01:00
Thibaut Girka 19f7bd1582 Show media on report UI 
Ports 219aac7800 to glitch-soc
 2018-03-16 15:27:13 +01:00
Thibaut Girka 22870985da Add close modal icon to report dialog (#6591) 
Port 379cdfaac5 to glitch-soc flavour
 2018-03-16 15:27:13 +01:00
Thibaut Girka 9cf574d0d2 Port federated reports UI to glitchsoc 
Port 41a01bec23 to glitch-soc
 2018-03-16 15:27:13 +01:00
Gô Shoemake 22f2750578
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url 
Remove text requirement when media attached from statuses (fixes #381)
 2018-03-12 13:09:42 -07:00
Gô Shoemake 2395a4c313
Merge pull request #344 from chriswmartin/getting-started-badge-merge 
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
 2018-03-12 13:07:59 -07:00
Thibaut Girka 841ef606a9 Remove text requirement when media attached from statuses (fixes #381) 
Ports cfa9b6e13a to glitchsoc
 2018-03-12 18:39:07 +01:00
Thibaut Girka 25c5223617 Port #6627 and #6636 to glitch-soc 2018-03-09 12:10:22 +01:00
cwm 0ddeed9377 add 'this.props' to fetchLists 2018-01-23 01:23:56 -06:00
cwm 939075899e remove unused openOnboardingModal from getting_started 2018-01-22 19:38:34 -06:00
cwm 00be9eb3fe merge tootsuite pr #6313 into glitch 2018-01-22 19:05:13 -06:00
David Yip e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning 
Display a warning when composing unlisted toots with something looking like a hashtag
 2018-01-20 16:37:52 -06:00
Thibaut Girka 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag 
This is a backport of b6af88192f to the glitch flavour.
 2018-01-19 12:59:33 +01:00
David Yip bcd86404da
Port 7badad7797 to glitch frontend 2018-01-18 10:25:37 -06:00
David Yip 708ec07e27
Style fixes to make eslint happier, hopefully 2018-01-18 09:13:07 -06:00
kibi! b9f4896830 Fixes to drawer and CWs 2018-01-14 15:31:00 -08:00
beatrix cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor 
SCSS Refactor
 2018-01-14 17:48:02 -05:00
beatrix 39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend 
Add glitchy elephant friend
 2018-01-14 17:40:27 -05:00
kibi! 0fb3bd09e9 Oops this should have been a part of last commit 2018-01-14 14:21:41 -08:00
kibi! 1fa03e026a Fixes onboarding modal (#318) 2018-01-14 14:13:24 -08:00
David Yip c2669f93d0
Fix eslint errors. #294. 2018-01-14 05:56:43 -06:00
David Yip 756a9cd139
Run slightly less afoul of accessibility checks. #294. 
This makes the clickable element an interactive element, but doesn't add
alt text and makes it not-obvious that you can click the elefriend.  On
one hand, this goes against good practice; on the other hand, it's not
*supposed* to be obvious that you can click the elefriend.
 2018-01-14 05:07:08 -06:00
David Yip e64cc311dd
Introduce a bit of luck into the elefriend selection. #294. 2018-01-14 04:46:21 -06:00
David Yip cd1377de7f
Bind click event to elefriend cycling. #294. 2018-01-14 03:35:25 -06:00
David Yip 1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294. 
Also lay some groundwork needed to interactively change the
glitchfriend.

The codebase uses "elefriend" because it's shorter and didn't require me
to realign the actions in actions/compose.js.  Same idea, though.
 2018-01-14 03:06:11 -06:00
David Yip 1e0b707018
Add the shrinking glitchy elefriend. #294. 2018-01-13 21:27:39 -06:00
David Yip 835eec8a4c
Prototype out glitchy elephant friend. #294. 
Glitched elephant friends kindly provided by @ncls7615.
 2018-01-13 21:27:14 -06:00
ncls7615 a9be680807
Fix padded-blocks error 2018-01-14 04:12:41 +09:00
ncls7615 6a73c8c8a2
Initial scss refactor 2018-01-14 03:41:20 +09:00
ncls7615 cf5789146b
Fix dropdown text 2018-01-12 23:18:25 +09:00
cwm aef4b1af66 Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223) 2018-01-09 10:51:14 -06:00
cwm b535f24fe5 Use const instead of let for constant (tootsuite pr #6106) 2018-01-09 10:35:36 -06:00
cwm 0d4dcb5fb2 change key to path in timeline settings containers 2018-01-09 09:58:40 -06:00
cwm 6d1c325167 Rename key to path in actions and reducers for settings (tootsuite pr #6105) 2018-01-09 09:48:14 -06:00
cwm 5963630c63 Prevent duplicate load of favourites (tootsuite pr #5931) 2018-01-09 08:46:35 -06:00
kibigo! b5874c1428 Fixes to search dropdown 2018-01-06 15:34:01 -08:00
Ondřej Hruška 9f29fd31ba
fixed ctrl enter 2018-01-06 19:58:04 +01:00
kibigo! c71d848855 my global .gitignore excluded this file ;_; 2018-01-05 21:40:02 -08:00
kibigo! e4bc013d6f Threaded mode~ 2018-01-05 21:16:43 -08:00
kibigo! 6932b464e6 Fixed improper dropdown func binding for #293 + toot button spacing 2018-01-05 21:02:53 -08:00
kibigo! ad10a80a99 Styling and autosuggest fixes for #293 2018-01-05 20:43:16 -08:00
kibigo! 8bf9d9362a Fixes composer mounting issue with #293 2018-01-05 18:30:06 -08:00
beatrix f441770e50
Merge pull request #290 from chriswmartin/web-push-updates 
Web push updates
 2018-01-05 18:29:57 -05:00
beatrix b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix 
unique ColumnLink keys in getting_started
 2018-01-05 18:29:40 -05:00
cwm 9fc08e4861 add key to lists div 2018-01-05 09:00:48 -06:00
cwm 6236577734 change how list ColumnLink keys are determined 2018-01-05 08:12:34 -06:00
kibigo! d7ce339c2e WIP <Compose> Refactor; Fin~ 2018-01-04 21:17:30 -08:00
kibigo! 42f50049ff WIP <Compose> Refactor; 1000 tiny edits 2018-01-04 18:33:13 -08:00
kibigo! b4a3792201 WIP <Compose> Refactor; <ActionsModal>; dropdowns 2018-01-04 18:31:00 -08:00
kibigo! 083170bec7 WIP <Compose> Refactor; SCSS ed. 2018-01-04 18:23:46 -08:00
kibigo! 8713659dff WIP <Compose> Refactor; <OnboardingModal> ed. 2018-01-04 18:21:59 -08:00
kibigo! 3c29f57404 WIP <Compose> Refactor; <Drawer> ed. 2018-01-04 18:21:59 -08:00
kibigo! 924ffe81d4 WIPgit status <Compose> Refactor; <Composer> ed. 2018-01-04 18:21:59 -08:00
cwm 4ce44ba470 remove unused 'saveSettings' from column_settings_container 2017-12-30 16:42:26 -06:00
cwm 0dce26b82b web push updates (tootsuite PRs #5879, #5941, #6047) 2017-12-30 11:45:01 -06:00
beatrix 7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch 
Merge various small vanilla updates into glitch
 2017-12-26 17:03:29 -05:00
cwm 20ad071931 Set direction style to reply indicator (tootsuite pr #6006) 2017-12-26 14:20:41 -06:00
cwm 337c2e77ee Fix layout for RTL (tootsuite pr #6014, #6018) 2017-12-26 13:49:53 -06:00
cwm 2bbd22e91c Rename settingKey to settingPath (tootsuite pr #6046 & #6098) 2017-12-26 13:21:20 -06:00
cwm cc6a2ffd0a use 'flavours/glitch/' prefix in new imports 2017-12-26 10:41:44 -06:00
cwm 22818d2a16 Add mute, block, conversation mute actions to detailed status dropdown menu 2017-12-26 10:13:38 -06:00
beatrix 60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements 
Getting started column improvements
 2017-12-21 18:47:07 -05:00
David Yip 7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273. 2017-12-21 13:22:33 -06:00
cwm d736739e8f <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049) 2017-12-21 13:04:40 -06:00
David Yip dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245. 2017-12-21 05:25:16 -06:00
cwm 9042f9a813 add keyboard shortcuts to getting started (fixes #275) 2017-12-20 09:50:29 -06:00
cwm 14aae9c05c missed a semicolon 2017-12-17 22:21:15 -06:00
cwm be50e45a74 use makeMapStateToProps 2017-12-17 22:00:25 -06:00
cwm e4ebbf4f07 use list-ul icon in list header and web/lists 2017-12-17 21:25:18 -06:00
kibigo! e677dda07c Fixes #244 to make search results scrollable 2017-12-15 12:49:23 -08:00
cwm 17e53b931c code style fixes 2017-12-12 23:07:12 -06:00
cwm 9719983f2d move list items into an array, don't unnecessarily concat misc nav item 2017-12-12 22:50:20 -06:00
cwm b6ded7119e travis fixes 2017-12-12 08:50:31 -06:00
cwm 9b7208f4b4 readded connect for onboarding modal 2017-12-12 00:17:07 -06:00
cwm b358483ef2 remove unneeded imports from getting_started_misc 2017-12-12 00:09:18 -06:00
cwm 37ced4c903 add components to getting started column 2017-12-12 00:01:17 -06:00
cwm 072ab191cc pulled master, moved locale entry to new location 2017-12-10 15:22:15 -06:00
cwm eec5d350fd removed unneeded actions_modal div 2017-12-10 15:14:56 -06:00
cwm 066458a659 removed one last app settings addition 2017-12-10 09:25:44 -06:00
cwm 7a8711ccac removed app settings additions 2017-12-10 09:10:47 -06:00
cwm 8606e53384 moved locales to glitch, created add settings entry 2017-12-09 15:15:11 -06:00
cwm c5a688d70e remove trailing spaces 2017-12-09 12:41:24 -06:00
cwm 22cdbca82c fixes, functioning now 2017-12-09 12:06:00 -06:00
cwm a489e5d5cd added a few more things 2017-12-09 11:21:41 -06:00
cwm baf9ea8018 remove keyboard shortcuts from getting started because thats a different thing 2017-12-09 10:32:46 -06:00
cwm abe95b614b add initial components based off of tootsuite pr #1507 2017-12-09 10:26:22 -06:00
cwm b165950ca7 add keyboard shortcut to getting started, add missing list style 2017-12-08 20:30:45 -06:00
cwm 47157e07b2 merged tootsuite pr #5811 into glitch flavour 2017-12-08 20:13:08 -06:00
cwm f44c8fd130 merged tootsuite pr #5750 into glitch flavour 2017-12-08 19:40:49 -06:00
kibigo! 96126a5b01 Packaged local_settings styles in common 2017-12-07 13:36:18 -08:00
David Yip 67d625c42d
Fix hide reblogs in glitch frontend (#5909) 
This applies 432761f375 to the glitch copy
of the Mastodon frontend.
 2017-12-06 22:35:45 -06:00
David Yip 935c1944e2
Merge pull request #241 from glitch-soc/no-dm-option 
Add option to remove DMs from home (#126)
 2017-12-06 22:20:55 -06:00
kibigo! 2f2467ce8e Add option to remove DMs from home (#126) 2017-12-06 17:50:27 -08:00
David Yip 133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239) 2017-12-06 18:23:28 -06:00
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme 2017-12-04 11:07:01 -06:00
kibigo! bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00