beatrix
|
252de634bb
|
Merge pull request #250 from chriswmartin/fav-confirm-modal
add favourite confirmation modal
|
2017-12-10 23:10:19 -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 |
|
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!
|
99e8710095
|
Javascript intl8n flavour support
|
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 |
|
cwm
|
7a066e814b
|
moved locales to glitch, created add settings entry
|
2017-12-09 15:15:11 -06:00 |
|
cwm
|
c47e5232bd
|
remove trailing spaces
|
2017-12-09 12:41:24 -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 |
|
kibigo!
|
f9387aabaa
|
Glitch doesn't have a home stylesheet anymore
|
2017-12-07 14:32:52 -08:00 |
|
kibigo!
|
31674d5083
|
Packaged local_settings styles in common
|
2017-12-07 13:36:18 -08:00 |
|
David Yip
|
82cd4a0a3c
|
Fix hide reblogs in glitch frontend (#5909)
This applies 6bb4fb008a to the glitch copy
of the Mastodon frontend.
|
2017-12-06 22:35:45 -06:00 |
|
David Yip
|
04b03999c2
|
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!
|
8dc8ea2c0a
|
Add option to remove DMs from home (#126)
|
2017-12-06 17:50:27 -08:00 |
|
David Yip
|
08290b0b02
|
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
|
2017-12-06 18:23:28 -06:00 |
|
David Yip
|
1221e3075d
|
Merge branch 'gs-master' into glitch-theme
|
2017-12-04 11:07:01 -06:00 |
|
kibigo!
|
882055afd0
|
Rename themes -> flavours ? ?
|
2017-12-03 23:26:40 -08:00 |
|