mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
15,030 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

1761 Commits

Author SHA1 Message Date
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