ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,219 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

1453 Commits (a3ac322ded4277f954b45697ea765b0d90d37e9d)

Author SHA1 Message Date
Thibaut Girka 18d9a7fd71 Fix caret position after inserting suggestions (fixes #281) 2018-05-26 12:17:03 +02:00
Thibaut Girka d8793e1bee Remove unneeded code now that attachment URL isn't appended to toots 2018-05-26 12:17:03 +02:00
Thibaut Girka 4c91215e1f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses 
Port 2587fcdd27 to glitch-soc
 2018-05-25 11:16:11 +02:00
ThibG 7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search 
[Glitch] Fetch relationships for search results in UI
 2018-05-23 18:54:51 +02:00
Thibaut Girka 0553496b76 Change notification cleaning checkbox color (fixes #511) 2018-05-23 18:29:15 +02:00
Thibaut Girka 247f55f673 [Glitch] Fetch relationships for search results in UI 
Port webui changes from cba2897108 to glitch-soc
 2018-05-22 13:05:40 +02:00
Thibaut Girka d0b2f71501 Fix width only being set for standalone media 2018-05-21 18:25:41 +02:00
Thibaut Girka 3ad3cee44c [Glitch] Use real container width in MediaGallery srcSet 
Port 22e067bf5c to glitch-soc
 2018-05-21 17:55:07 +02:00
Thibaut Girka 463078dcc4 [Glitch] Do not override the default push notification settings 
Port 1951ff41b3 to glitch-soc
 2018-05-21 17:52:26 +02:00
Thibaut Girka c53aacdfa0 Recover glitch-soc specific styles that were removed by accident 2018-05-21 15:56:47 +02:00
Thibaut Girka d250e072a2 In footer, replace text "Mastodon" with logo 
Port SCSS changes from 93c66f0c03 to glitch-soc
 2018-05-20 11:29:06 +02:00
Thibaut Girka 9ed8051961 Add preference to hide following/followers lists 
Port SCSS from 1e02dc8715
 2018-05-20 11:28:58 +02:00
Thibaut Girka 50540446f5 [Glitch] Improvements to toots display in admin view 
Port SCSS changes from 0f2fbf7d05
(I'm sorry for the animated rainbows)
 2018-05-20 11:28:58 +02:00
Thibaut Girka 9d6788b30b Prevent click on video from opening detailed toot 2018-05-18 17:49:51 +02:00
Thibaut Girka 2154bd1b5a Widen clickable area of toots 2018-05-18 17:33:58 +02:00
David Yip 023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup 
Remove service worker code that has never been used
 2018-05-18 08:37:31 -05:00
David Yip 81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji 
[Glitch] Enable custom emojis in profiles
 2018-05-18 07:55:00 -05:00
Thibaut Girka 07baa1ddb5 [Glitch] Open video modal on public UI 
Port d9b2f84c92 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka 94db024e4c [Glitch] Combine similar components into one on public UI 
Port f9afd06221 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka dd1d98f9cf [Glitch] Show card modal on public pages 
Port 16fee0335f to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka 52b2f18b15 [Glitch] Enable custom emojis in profiles 
Port 61a9018607 to glitch-soc
 2018-05-17 15:57:16 +02:00
Thibaut Girka ca49ad86c6 Remove service worker code that has never been used 2018-05-17 15:39:37 +02:00
ThibG 80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu 
[Glitch] Feature: Direct message from menu
 2018-05-16 20:17:08 +02:00
ThibG 9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color 
Fix mastodon-light background color of the composer textarea when posting
 2018-05-16 20:16:59 +02:00
Thibaut Girka 784712791d [Glitch] Reword the direct message warning 
Port 53c2164e9c to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka 97c69de416 [Glitch] Feature: Direct message from Statuses 
Port 904a2479dd to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka fb6de5310d [Glitch] Fix issues with sending direct messages from user profile 
Port 4fd71accd4 to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka a5fac975f3 [Glitch] Feature: Direct message from menu 
Port d1f34151ae to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka eb9c9855ce Fix mastodon-light background color of the composer textarea when posting 2018-05-16 19:37:44 +02:00
Thibaut Girka dfa60cb0a8 Fix modals testing for props.noEsc (fixes #482) 2018-05-15 10:39:12 +02:00
Thibaut Girka 971218d1dc Change local settings SCSS to be more consistent with modals 2018-05-14 21:39:04 +02:00
beatrix 4665965543
Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme 
Port Sylvhem's mastodon-light to glitch flavour
 2018-05-13 18:57:58 -04:00
ThibG bd4decb7db
Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup 
Fix root modal's keyup handling (Fixes #478)
 2018-05-11 23:04:12 +02:00
Thibaut Girka 769a48495c Fix root modal's keyup handling (Fixes #478) 2018-05-11 22:42:32 +02:00
ThibG e7ed61917b
Merge pull request #475 from ThibG/fixes/update-scss 
Update SCSS from upstream
 2018-05-11 16:51:14 +02:00
Thibaut Girka 6284039832 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka f2e5ed6841 Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka 8860f14ef0 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka 4a1040c4cb [Glitch] Adjust RTL styles for landing page 
Port 8bf3e750ab to glitch-soc
 2018-05-11 14:34:23 +02:00
Thibaut Girka e8644f3a4b Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka 4cd65fe074 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka 1a4d735b1d Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka db73c0bc5d Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
Thibaut Girka f6ec8c4821 [Glitch] Use plaintext value for field value tooltips in web UI 
Port d185f3ddaf to glitch-soc

This doesn't change anything for glitch-style fields, but those will go
away eventually
 2018-05-10 14:11:23 +02:00
Thibaut Girka 5d8052e715 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka 2f01935cba Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka 30bb530c70 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Spencer Alves f2ff167c1a Add an extra icon to indicate that a status is part of a conversation 2018-05-07 22:10:34 -07:00
Thibaut Girka 8f3402b1f0 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
beatrix 919e2098cb
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements 
Various improvements to the reports modal
 2018-05-07 09:45:13 -04:00
Thibaut Girka 658ac4396c Hide media in report modal regardless of whether they are marked sensitive 
The rationale behind this is that if the user wants to report violent media,
they might not want to see it repeatedly. The “sensitive” property is still
kept, displaying different messages for hidden media depending on whether
they are marked as sensitive.
 2018-05-07 15:00:55 +02:00
Thibaut Girka 6b94237810 [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka 7972464e71 [Glitch] Also display replies in report modal 
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
 2018-05-07 14:55:16 +02:00
Thibaut Girka ffdb85f859 Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
David Yip 2e25da4da0
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes 
Glitch soc/rollback scroll changes
 2018-05-06 17:39:07 -05:00
Thibaut Girka de7feea30e Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 553cc28240.
 2018-05-06 21:50:33 +02:00
Thibaut Girka 4133f70902 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit 32974a58dc.
 2018-05-06 21:50:26 +02:00
Thibaut Girka 1adca9b040 Fix glitch high-contrast skin text colors 
Port from 3c5006ec7f
 2018-05-06 21:00:35 +02:00
beatrix 331190e5fb
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility 
Improve accessibility of toot dropdown menu
 2018-05-06 12:12:20 -04:00
beatrix 92f192e9b1
Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement 
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
 2018-05-06 11:33:09 -04:00
beatrix 4480cd745f
Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over 
Prevent timeline from moving when cursor is hovering over it
 2018-05-06 11:32:56 -04:00
beatrix 06770656eb
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables 
Add text color variables + minor SCSS fixes + high contrast skin
 2018-05-06 11:32:42 -04:00
beatrix 35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items 
Support upstream bio items / custom account fields
 2018-05-06 11:32:05 -04:00
Thibaut Girka 65349bc155 Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00
Thibaut Girka 2d065ceaf6 minor fix 2018-05-05 22:38:15 +02:00
Thibaut Girka f7a076eded [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00
Thibaut Girka caebf69e77 Move attachment-lists out of lists.scss 2018-05-05 22:33:02 +02:00
Thibaut Girka bd3b9bf7b9 [Glitch] Fix text color in "show more" link inside boost confirmation modal 
Port ba917e15f6 to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka 983328376b Fix link colors in report modal 2018-05-05 22:33:02 +02:00
Thibaut Girka b3a236637e [Glitch] Add color variables of texts for better accesibility 
Port 74dae9458d and related to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka 390cfdef2e [Glitch] Update SCSS of admin and setting pages 
Port the SCSS changes from cb74c0cfe4 to glitch-soc
 2018-05-05 17:58:01 +02:00
Thibaut Girka 9edc5cafe4 [Glitch] Improve styling of closed registrations message 
Port SCSS changes from 5acd5315f2 to glitch-soc
 2018-05-05 17:43:09 +02:00
Thibaut Girka 32974a58dc [Glitch] Do not re-position scroll when loading more (inserting items from below) 
Port 8c601b54cc to glitch-soc
 2018-05-05 17:18:55 +02:00
Thibaut Girka 553cc28240 [Glitch] Prevent timeline from moving when cursor is hovering over it 
Port 58852695c8 to glitch-soc
 2018-05-05 17:18:25 +02:00
Thibaut Girka cee157fc19 Improve accessibility of toot dropdown menu 
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in generic dropdown menus

Partial port from ef7d64c801 to glitch-soc
 2018-05-05 17:11:48 +02:00
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 70a16d8858 [Glitch] Improve relative timestamps in web UI 
Port 660cb058e1 to glitch-soc flavour
 2018-05-02 13:45:40 +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
Thibaut Girka 91fb82a4dd Fix style of account fields form 2018-04-29 18:48:44 +02:00
beatrix 64be38da0c
Merge pull request #448 from m4sk1n/glitch-pl 
🌍: 🇵🇱⬆️
 2018-04-27 10:31:08 -04:00
Marcin Mikołajczak deb91f5989 🌍: 🇵🇱⬆️ 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-27 14:15:38 +02:00
Thibaut Girka 1222e0a381 Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps 
As we are already using the new getSnapshotBeforeUpdate lifecycle method,
we apparently cannot use the deprecated ones at all in this component.
 2018-04-27 01:24:55 +02:00
Thibaut Girka b39f3648a7 Tentative fix for #446 2018-04-27 00:59:36 +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
beatrix 8f12afb599
Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned 
[Glitch] Fix the hot key (j, k) does not function correctly when ther…
 2018-04-26 11:33:48 -04:00
beatrix 1e9fe95e13
Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline 
[Glitch] Do not set emoji as inline-block
 2018-04-26 11:33:36 -04:00
beatrix 33691f4920
Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen 
[Glitch] Fix fullscreen video player
 2018-04-26 11:33:24 -04:00
Una Thompson 62bea7a290 Fix fade being colored wrongly for DMs and upon focus 2018-04-24 11:34:17 -04:00
Thibaut Girka 240833c023 Fix actions modal on mobile (fixes #441) 2018-04-23 23:18:36 +02:00
Thibaut Girka 51d276fb98 [Glitch] Fix fullscreen video player 
Port 53b1d88873 to glitch-soc
 2018-04-23 20:38:08 +02:00
Thibaut Girka 003d114332 [Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. 
Port 23106844a1 to glitch-soc
 2018-04-22 23:11:16 +02:00
Thibaut Girka 105ffaef8f [Glitch] Do not set emoji as inline-block 
Port 597948fb13 to glitch-soc
 2018-04-22 22:10:53 +02:00
Thibaut Girka b383c0688a [Glitch] Do not overwrite some status attributes in reducer 
Backport 386365090c
 2018-04-22 19:19:01 +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
Thibaut Girka 63d671b18f [Glitch] Fix button hiding when header title is too long 
Port ffb2b8ef8c to glitch-soc
 2018-04-22 19:17:10 +02:00
Thibaut Girka abf7c5b850 [Glitch] Fix column headers accessibility 
Port 08e4c78e78 to glitch-soc.

SCSS fix inspired by 69f13e7bca.
 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 8f1ec48cbe
Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api 
[Glitch] retrieve custom emoji list via API instead of before page load
 2018-04-22 12:10:48 -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 6fb610f865
Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering 
Status filtering fixes from upstream
 2018-04-22 12:08:12 -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
Una Thompson 5f9b85a0cf Add fade and margin to collapsed statuses 2018-04-22 11:34:19 -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 13fa8ec2c7 [Glitch] Fix status filtering in contexts reducer 
Port 1a37d7e252 to glitch-soc
 2018-04-19 16:43:02 +02:00
Thibaut Girka f84b4d90cb [Glitch] Do not filter the status collection after muting and blocking 
Port fd87e5a53b to glitch-soc
 2018-04-19 16:42:27 +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 931a4d1ebf Clean up dead code 2018-04-19 11:30:42 +02:00
Thibaut Girka 8f8b71a278 Use React's new lifecycles for scrollable lists 2018-04-19 11:29:37 +02:00
Thibaut Girka 3068384dbc Glitchsoc-specific changes to allow boosting own private toots 2018-04-19 11:24:29 +02:00
Thibaut Girka 779aa707ec Only compute height dynamically for standalone media 
This prevents changing the status' height and triggering jumps in the TL
 2018-04-19 11:16:18 +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
Thibaut Girka f1e25b672a Use javascript to set MediaGallery height automatically 2018-04-19 11:16:18 +02:00
Thibaut Girka a95f8271be Revert some glitch-specific refactoring 
In order to keep my sanity when porting changes between glitch-soc and upstream.
 2018-04-19 11:16:18 +02:00
Thibaut Girka 1822ce89f9 [Glitch] retrieve custom emoji list via API instead of before page load 
Port b08ab329f4 to glitch-soc
 2018-04-19 11:12:52 +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
David Yip f879672554
Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements 
Backport a few MediaGallery/Video changes from upstream (fixes #423)
 2018-04-16 14:41:36 -05:00
Thibaut Girka 5cc7c4b920 Fix extended video player (gifv) modal size 
It was currently full-size
 2018-04-14 21:47:56 +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
imncls dd4ad6300b
Add missing Japanese translation 2018-04-14 07:53:56 +09: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 043a699990 Update glitch-soc style to match changes to reports UI 
Port style changes from d9b62e34da
 2018-04-11 19:15:42 +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 9073687f66 [Glitch] Fix video player height 
Port 31e7b73084 to glitch-soc
 2018-04-09 01:08:51 +02:00
Thibaut Girka 101e6564fd [Glitch] Refactor scss 
Port f691afaae9 to glitch-soc
 2018-04-09 01:08:50 +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
beatrix 77b650b69c
Merge pull request #412 from ThibG/glitch-soc/cleanup 
Remove duplicate message entries (minor code cleanup)
 2018-04-04 11:36:54 -04:00
Thibaut Girka d0e792e231 Update accounts SCSS for public pages 2018-04-04 15:40:59 +02:00
Thibaut Girka 75f2e9fd97 Remove duplicate message entries 2018-04-04 12:19:00 +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 2871a82fcc [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport 
Port f6a8d835d3 to glitch-soc
 2018-03-30 12:31:29 +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 482ad7d7c4 Keep list of blocked domains 
Might be overkill, but I'm trying to follow the same logic as for blocked users
 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 937ace10d9 Fix undefined URL in `fetchDomainBlocks` 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 4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents 
Render toots with empty contents
 2018-03-28 16:39:12 -05:00
Thibaut Girka 7db431eac6 Fix attachment lists 2018-03-28 22:19:36 +02:00
Thibaut Girka 53eab4470d Render toots with empty contents 
This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon.
 2018-03-28 21:13:45 +02:00
Thibaut Girka 88790b91de [Glitch] Display AttachmentList in notifications 
Port 77406d3a09 to glitch-soc
 2018-03-27 16:09:33 +02:00
Thibaut Girka 3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing 
Port 86a9de6753 to glitch-soc
 2018-03-27 16:09:27 +02:00
Ash Levy 58eeb92755 expanded notifications show like default 2018-03-22 10:20:36 -04:00
Thibaut Girka 12b0ea0667 [Glitch] Cancel outdated pending compose suggestions 
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
 2018-03-20 14:20:17 +01:00
David Yip c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs 
fix compressed notifications again (#393)
 2018-03-19 15:41:09 -05:00
Ash Lea 5b00b8f0da fix .status__info__icons layout 2018-03-19 07:13:18 -04: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
Ash Levy c68c1466ac fix compressed notifications again (#393) 2018-03-18 13:42:28 -04:00
David Yip fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs 
fix non-notification boosts for compressed notifications
 2018-03-16 18:15:59 -05:00
Ash Levy 33d5fe889a fix non-notification boosts 2018-03-16 18:36:35 -04:00
Thibaut Girka 6f0e50f9a0 [Glitch] Federate pinned statuses over ActivityPub 
Port 9110db41c5 to glitch
 2018-03-16 23:16:20 +01:00
Thibaut Girka cd73af3bd0 [Glitch] Improve style of web UI account tabs 
Port of 38b9af76a2 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
David Yip 50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes 
Port reports ui changes to glitch-soc flavour
 2018-03-16 17:13:09 -05:00
David Yip a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs 
compress boost/fave notifications more
 2018-03-16 16:35:15 -05:00
Thibaut Girka 9c40a5f3c8 Fix toot text color in the report modal 2018-03-16 15:27:13 +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
Ash Levy 9317f6853e compress boost/fave notifications more 2018-03-13 13:54:57 -04: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
David Yip 65e2a4645e
Use glitchsoc TimelineComponent's margin/padding on about page. 2018-03-03 11:16:10 -06:00
David Yip 6176e278f4
Copy in new CSS for about page. 2018-03-03 11:01:24 -06:00
yuzulabo 43cc79aaa0
Fix border-radius of owner avatar in /about/more 2018-02-25 23:27:32 +09:00
imncls f2f19e1f8a
Update SCSS 2018-02-24 03:22:58 +09:00
imncls 7bff3243ae
Update columns.scss 2018-02-24 01:45:15 +09:00
imncls ef1d46948a
Update containers.scss 2018-02-24 01:26:48 +09:00
imncls 82408904a1
Update index.scss 2018-02-24 01:25:49 +09:00
imncls fa3641df7f
Update about.scss 2018-02-24 00:22:05 +09:00
Thibaut Girka fb6f131fa1 Revert 245816ab27 (fixes #348) 
Since 245816ab27, IntersectionObserverArticle
assumes that its children do not change unless the number of children changes.

This is not the case with the notification overlay, which resulted in the
checkmark of notification cleaning mode not updating unless scrolling to make
notifications appear/disappear.

This change may negatively impact performances.
 2018-02-10 20:59:50 +01:00
ncls7615 15a5b3372a
Fix detailed-status 2018-02-04 10:35:09 +09:00
Thibaut Girka 2107891edb Remove some leftover code, I guess 2018-01-23 09:20:18 +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
David Yip 24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream 
Merge upstream
 2018-01-20 16:37:35 -06:00
David Yip 3cae362214
Merge new onboarding styles; delete refs to PNGs. 2018-01-20 11:23:06 -06:00
Thibaut Girka 1619efd735 Do not discard statuses obtained via websocket when API request finishes 
This backports 0b888acfd4
 2018-01-19 21:59:12 +01: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! cda845ae0e Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
kibi! 8ee6ed358f Increase priority of favstar gold 2018-01-14 16:05:44 -08:00
kibi! 1ee0e91fb6 Fixes to notification styling 2018-01-14 15:48:54 -08: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
kibi! a5931e1f48 Fixed autocollapse detection 2018-01-14 13:29:51 -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 53cbc9933e
Add wave background; blend elefriend in a bit more. #294. 2018-01-14 04:00: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 f9b08e2142
Fix collapsed toot style 2018-01-14 11:13:55 +09:00
ncls7615 1ebe66b78c
Fix un-fullwidth media style 2018-01-14 11:07:32 +09:00
ncls7615 be2bac05aa
Fix media detailed style 2018-01-14 10:38:51 +09:00
ncls7615 b5476f6c75
Fix confirmation modal bug 2018-01-14 09:51:01 +09:00
ncls7615 bc0524834e
Fix letterbox bug 2018-01-14 09:25:35 +09:00
ncls7615 6ecf81cacf
Improve scss refactor 5 2018-01-14 09:17:38 +09:00
ncls7615 64425dbb77
Improve scss refactor 4 2018-01-14 09:12:10 +09:00
ncls7615 a16d885ac9
Improve scss refactor 3 2018-01-14 08:47:59 +09:00
ncls7615 5f35b39f6f
Improve scss refactor 2 2018-01-14 07:48:18 +09:00
ncls7615 bb2ca23839
Improve scss refactor 1 2018-01-14 07:18:50 +09: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
Gô Shoemake 9b9b7fa005
Load packs/public.js for glitch#admin 2018-01-12 18:51:52 -08:00
Marcin Mikołajczak ee7217bc94 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-12 23:08:51 +01:00
ncls7615 cf5789146b
Fix dropdown text 2018-01-12 23:18:25 +09:00
David Yip 095a00ef3d
Merge pull request #316 from glitch-soc/fix-async 
Fix glitch async chunks
 2018-01-09 18:30:45 -06:00
kibigo! 35be02f21d Renamed glitch async chunks 2018-01-09 16:26:14 -08: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 f43c2f12f3 Fix overflowing audit logs (tootsuite pr #6184) 2018-01-09 10:40:14 -06:00
cwm 9bdbe66316 Set background to the navigation of Getting Started column (tootsuite pr #6163) 2018-01-09 10:37:27 -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 7f4374d97d Fix newlines-to-spaces functionality (tootsuite pr #6158) 2018-01-09 08:52:14 -06:00
cwm 8a0e4bb9a4 Hide moved account's follow button in search result (tootsuite pr #5913) 2018-01-09 08:50:55 -06:00
cwm 5963630c63 Prevent duplicate load of favourites (tootsuite pr #5931) 2018-01-09 08:46:35 -06:00
David Yip ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs 
Show SENSITIVE tag on sensitive images (#267)
 2018-01-08 23:19:14 -06:00
kibigo! 60433d03f5 Add missing comma 2018-01-08 18:38:28 -08:00
kibigo! 5d2ef7a616 Show SENSITIVE tag on sensitive images (#267) 2018-01-08 18:25:29 -08:00
kibigo! 824a790e63 Threads now inherit privacy directly (#309) 2018-01-08 16:35:01 -08:00
ncls7615 ef0b7d1e76
fix list editor scss 2018-01-09 02:50:24 +09:00
David Yip 2dc4fbbd1a
When pulling out max_toot_chars, handle nulls 
flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences.  This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access.  All values exported from that module must
therefore expect that case; previously, the max chars value didn't.

Addresses #306.
 2018-01-08 09:45:59 -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
Ondřej Hruška 53caab0c0b
Fix the always-threaded bug 2018-01-06 19:55:53 +01:00
ncls7615 f5a4201ad8
Update ja.js 2018-01-07 01:51:49 +09:00
beatrix a251c42192
Merge pull request #296 from glitch-soc/thread-mode 
Threaded mode~
 2018-01-06 11:28:36 -05:00
beatrix 2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout 
Fix search popout
 2018-01-06 11:25:59 -05:00
beatrix fa92e88fb2
appease eslint 2018-01-06 10:30:49 -05:00
ncls7615 da98c33161
Fix search popout 2018-01-06 21:50:11 +09:00
David Yip 2eed4ace11
Read max_toot_chars from root object. Fixes #297. 
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
 2018-01-06 03:01:11 -06: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
beatrix faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor 
Compose refactor
 2018-01-05 18:29:08 -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
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-04 14:42:58 +01:00
cwm 72b99f6ee4 bug fix (tootsuite pr #6120) 2017-12-31 08:26:50 -06: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
cwm 832a93e67c Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000) 2017-12-28 08:30:51 -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 14243bf80a Reduce motion for boost animation (tootsuite pr #5871) 2017-12-26 14:04:52 -06:00
cwm 337c2e77ee Fix layout for RTL (tootsuite pr #6014, #6018) 2017-12-26 13:49:53 -06:00
cwm 46565ed746 Fix focused background color of favourited direct toot (tootsuite pr #6021) 2017-12-26 13:30:23 -06:00
cwm 815524412b Move dropdown transform origin (tootsuite pr #6091) 2017-12-26 13:28:19 -06:00
cwm 083571915f onMuteNotifications validation (tootsuite pr #6092) 2017-12-26 13:25:43 -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
ncls7615 191b625a27
Fix account header avatar 2017-12-22 07:12:49 +09: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
ncls7615 d3b2677775
Add en and ja 2017-12-19 20:16:48 +09: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
ncls7615 9e8fa3caee fix admin/action_logs page 2017-12-16 20:27:26 +09:00
kibigo! e677dda07c Fixes #244 to make search results scrollable 2017-12-15 12:49:23 -08:00
NCLS e9a5bde9a0
Update ja.js 2017-12-15 19:43:10 +09:00
NCLS 61ed5b972c
Update ja.js 2017-12-15 19:38:13 +09: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
ncls7615 b93ad3d0e8 add ja 2017-12-12 13:13:54 +09:00
beatrix 771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux 
New flavour/skin UX
 2017-12-11 09:36:14 -05:00
ncls7615 9d5ecdbf41 remove picture 2017-12-11 13:52:17 +09:00
kibigo! ed7231947c Added styling 2017-12-10 20:32:28 -08:00
kibigo! bdca1614d5 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo! dabf66e676 Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
beatrix 08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal 
add favourite confirmation modal
 2017-12-10 23:10:19 -05:00
ncls7615 d420e2f047 add comma 2017-12-11 09:50:52 +09:00
ncls7615 279231c5dd " => ' 2017-12-11 09:46:17 +09:00
ncls7615 a98b0a47ef Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles 
# Conflicts:
#	app/javascript/glitch/locales/ja.json
 2017-12-11 09:43:21 +09:00
cwm 0466aa8d08 use single quotes in locale entry 2017-12-10 15:39:23 -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
kibigo! cd107e92cb Move ja localization to new locaiton 2017-12-10 11:09:59 -08:00
kibigo! 6b7085a33e Linting fixes 2017-12-10 11:08:04 -08:00
kibigo! b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! d08d0f9f33 Ruby intl8n for themes 2017-12-10 11:08:04 -08: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 02d71c6a11 fix a missing semicolon and mixed tabs/spaces that travis was complaining about 2017-12-08 21:09:53 -06:00
cwm 4a5401a58e merge tootsuite prs #5895 and #5889 into glitch flavour 2017-12-08 20:50:39 -06:00
cwm 28423dd046 merge tootsuite pr #5904 into glitch flavour 2017-12-08 20:45:18 -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! 9cdd81e9dd Glitch doesn't have a home stylesheet anymore 2017-12-07 14:32:52 -08: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