Gô Shoemake
|
8932a56d58
|
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
|
690cd248b1
|
change pack to 'auth'
|
2017-12-11 18:14:41 -06:00 |
|
cwm
|
7e8c87e443
|
load pack
|
2017-12-11 17:54:40 -06:00 |
|
kibigo!
|
1d7b78817a
|
Fixed index in webpack config
|
2017-12-11 10:45:21 -08:00 |
|
beatrix
|
7e1a419585
|
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
|
96a7247e9c
|
add ja
|
2017-12-12 00:28:33 +09:00 |
|
beatrix
|
af0031fe1b
|
Merge pull request #254 from glitch-soc/new-theme-ux
New flavour/skin UX
|
2017-12-11 09:36:14 -05:00 |
|
beatrix
|
cb05ff359f
|
Merge pull request #255 from KnzkDev/remove-picture
Remove getting-started picture
|
2017-12-11 09:08:13 -05:00 |
|
David Yip
|
b1f803d360
|
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
|
2017-12-11 00:17:30 -06:00 |
|
ncls7615
|
58a133978b
|
remove picture
|
2017-12-11 13:52:17 +09:00 |
|
kibigo!
|
d9e1496990
|
Added styling
|
2017-12-10 20:32:28 -08:00 |
|
kibigo!
|
a1c79ef544
|
Screenshot support for themes
|
2017-12-10 20:32:28 -08:00 |
|
kibigo!
|
901c08a999
|
Moved flavour UI into own prefs tab
|
2017-12-10 20:32:27 -08:00 |
|
beatrix
|
252de634bb
|
Merge pull request #250 from chriswmartin/fav-confirm-modal
add favourite confirmation modal
|
2017-12-10 23:10:19 -05:00 |
|
beatrix
|
bc727ab41c
|
Merge pull request #252 from ncls7615/glitch-langfiles
i18n: Add translate and fix problems
|
2017-12-10 22:53:48 -05:00 |
|
ncls7615
|
b07111ceba
|
add comma
|
2017-12-11 09:50:52 +09:00 |
|
ncls7615
|
3e6949b554
|
" => '
|
2017-12-11 09:46:17 +09:00 |
|
ncls7615
|
5cd4e577c2
|
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
|
2f56e7e00d
|
use single quotes in locale entry
|
2017-12-10 15:39:23 -06:00 |
|
cwm
|
34630e00cb
|
pulled master, moved locale entry to new location
|
2017-12-10 15:22:15 -06:00 |
|
cwm
|
06c490be96
|
removed unneeded actions_modal div
|
2017-12-10 15:14:56 -06:00 |
|
beatrix
|
3f30ccbf08
|
Merge pull request #246 from glitch-soc/theme-intl8n
Internationalization for flavours and skins
|
2017-12-10 15:41:22 -05:00 |
|
kibigo!
|
ea3154176e
|
Removed MORE theme localizns
|
2017-12-10 11:38:30 -08:00 |
|
kibigo!
|
bb65adc0c0
|
Move ja localization to new locaiton
|
2017-12-10 11:09:59 -08:00 |
|
kibigo!
|
b27126f1d6
|
Linting fixes
|
2017-12-10 11:08:04 -08:00 |
|
kibigo!
|
853082e760
|
Only localize js when there's a theme
|
2017-12-10 11:08:04 -08:00 |
|
kibigo!
|
99e8710095
|
Javascript intl8n flavour support
|
2017-12-10 11:08:04 -08:00 |
|
kibigo!
|
f0c12b28fd
|
Removed unused theme localization key
|
2017-12-10 11:08:04 -08:00 |
|
kibigo!
|
f4c233f59f
|
Ruby intl8n for themes
|
2017-12-10 11:08:04 -08:00 |
|
cwm
|
4b9fa497c6
|
removed one last app settings addition
|
2017-12-10 09:25:44 -06:00 |
|
cwm
|
0d6a515145
|
removed app settings additions
|
2017-12-10 09:10:47 -06:00 |
|
ncls7615
|
2a69b778c1
|
add and fix
|
2017-12-10 17:33:22 +09:00 |
|
beatrix
|
f836468a7e
|
Merge pull request #248 from chriswmartin/glitch-theme-lists
add lists to glitch flavour!
|
2017-12-10 00:53:37 -05:00 |
|
beatrix
|
ce2528c50b
|
Merge pull request #237 from dexamphetamine/jpn-localization
i18n: add ja glitch strings
|
2017-12-09 23:34:13 -05:00 |
|
amphetamine
|
5c58c4cbb3
|
i18n: add ja glitch strings
|
2017-12-09 19:39:41 -08:00 |
|
cwm
|
7a066e814b
|
moved locales to glitch, created add settings entry
|
2017-12-09 15:15:11 -06:00 |
|
cwm
|
38a5aa6c9e
|
ran i18n-tasks normalize for simple_form.en.yml
|
2017-12-09 13:00:07 -06:00 |
|
cwm
|
c47e5232bd
|
remove trailing spaces
|
2017-12-09 12:41:24 -06:00 |
|
cwm
|
98815c76ce
|
fixed fav setting change
|
2017-12-09 12:17:20 -06:00 |
|
cwm
|
ac42b2b95d
|
fixes, functioning now
|
2017-12-09 12:06:00 -06:00 |
|
cwm
|
7ff586054c
|
added a few more things
|
2017-12-09 11:21:41 -06:00 |
|
cwm
|
09c82d4343
|
remove keyboard shortcuts from getting started because thats a different thing
|
2017-12-09 10:32:46 -06:00 |
|
cwm
|
41bbfeec7c
|
add initial components based off of tootsuite pr #1507
|
2017-12-09 10:26:22 -06:00 |
|
cwm
|
f42a622bf9
|
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
|
2017-12-08 21:09:53 -06:00 |
|
cwm
|
591a3769f4
|
merge tootsuite prs #5895 and #5889 into glitch flavour
|
2017-12-08 20:50:39 -06:00 |
|
cwm
|
a762aa7933
|
merge tootsuite pr #5904 into glitch flavour
|
2017-12-08 20:45:18 -06:00 |
|
cwm
|
2668d56334
|
add keyboard shortcut to getting started, add missing list style
|
2017-12-08 20:30:45 -06:00 |
|
cwm
|
0fbf7f2838
|
merged tootsuite pr #5811 into glitch flavour
|
2017-12-08 20:13:08 -06:00 |
|
cwm
|
f6634f4fdc
|
merged tootsuite pr #5750 into glitch flavour
|
2017-12-08 19:40:49 -06:00 |
|
Jenkins
|
c6572ed6c8
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-08 13:17:14 +00:00 |
|