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

5199 Commits

Author SHA1 Message Date
cwm e4ebbf4f07 use list-ul icon in list header and web/lists 2017-12-17 21:25:18 -06: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
Gô Shoemake 04eaa1943f
Merge pull request #262 from chriswmartin/fix-oauth-pack 
Add missing set pack to authorizations_controller
 2017-12-11 19:34:19 -08:00
cwm 0a52e37648 change pack to 'auth' 2017-12-11 18:14:41 -06:00
cwm 44992df257 load pack 2017-12-11 17:54:40 -06:00
kibigo! 8aa527434c Fixed index in webpack config 2017-12-11 10:45:21 -08:00
beatrix 7d024a6b68
Merge pull request #259 from KnzkDev/flavours-ja 
i18n: Add ja translate for flavour/skin ux
 2017-12-11 10:56:41 -05:00
ncls7615 d8206d1931 add ja 2017-12-12 00:28:33 +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
beatrix 0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture 
Remove getting-started picture
 2017-12-11 09:08:13 -05:00
David Yip 204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController. 2017-12-11 00:17:30 -06: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
beatrix 01a3461bef
Merge pull request #252 from ncls7615/glitch-langfiles 
i18n: Add translate and fix problems
 2017-12-10 22:53:48 -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
beatrix 26c9b9fa27
Merge pull request #246 from glitch-soc/theme-intl8n 
Internationalization for flavours and skins
 2017-12-10 15:41:22 -05:00
kibigo! 64b839b769 Removed MORE theme localizns 2017-12-10 11:38:30 -08: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! 1c728df92e Only localize js when there's a theme 2017-12-10 11:08:04 -08:00
kibigo! b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! 8394430081 Removed unused theme localization key 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
ncls7615 0e56797792 add and fix 2017-12-10 17:33:22 +09:00
beatrix 282f48ddd1
Merge pull request #248 from chriswmartin/glitch-theme-lists 
add lists to glitch flavour!
 2017-12-10 00:53:37 -05:00
beatrix ef53c972b1
Merge pull request #237 from dexamphetamine/jpn-localization 
i18n: add ja glitch strings
 2017-12-09 23:34:13 -05:00
amphetamine eb2b971a52 i18n: add ja glitch strings 2017-12-09 19:39:41 -08:00
cwm 8606e53384 moved locales to glitch, created add settings entry 2017-12-09 15:15:11 -06:00
cwm fbd2a0127c ran i18n-tasks normalize for simple_form.en.yml 2017-12-09 13:00:07 -06:00
cwm c5a688d70e remove trailing spaces 2017-12-09 12:41:24 -06:00
cwm 7284e36fbd fixed fav setting change 2017-12-09 12:17:20 -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