Eugen Rochko
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
Yamagishi Kazutoshi
dc01c2f951
Disable status content outline ( #5921 )
2017-12-08 00:03:25 +01:00
Yamagishi Kazutoshi
65e0bbd958
Disable status content outline ( #5921 )
2017-12-08 00:03:25 +01:00
kibigo!
5758a12491
Skins shouldn't apply to fallback flavours
2017-12-07 14:49:54 -08:00
kibigo!
717b7d555c
Skins shouldn't apply to fallback flavours
2017-12-07 14:49:54 -08:00
kibigo!
e614dc144e
Fixed webpack skin folder globbing
2017-12-07 14:33:49 -08:00
kibigo!
753535c3c7
Fixed webpack skin folder globbing
2017-12-07 14:33:49 -08:00
kibigo!
f9387aabaa
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
kibigo!
9cdd81e9dd
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
kibigo!
96126a5b01
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
Lynx Kotoura
7cd63f0aae
ReFix font-weight of <strong> element for CJK fonts ( #5920 )
...
Also apply to Japanese and Korean.
Fix font-weight in landing pages.
2017-12-07 21:35:19 +01:00
Lynx Kotoura
832a7f9a05
ReFix font-weight of <strong> element for CJK fonts ( #5920 )
...
Also apply to Japanese and Korean.
Fix font-weight in landing pages.
2017-12-07 21:35:19 +01:00
SerCom_KC
d0875b6a93
Improve Chinese (Simplified) translations ( #5911 )
...
* i18n: (zh-CN) Change `管理` (moderation) to `运营`
* i18n: (zh-CN) Improve translations
2017-12-07 16:02:52 +01:00
SerCom_KC
7fcf15adf3
Improve Chinese (Simplified) translations ( #5911 )
...
* i18n: (zh-CN) Change `管理` (moderation) to `运营`
* i18n: (zh-CN) Improve translations
2017-12-07 16:02:52 +01:00
SerCom_KC
a77bf28ec1
Fix font-weight of <strong> element for CJK fonts ( #5914 )
...
* Fix font-weight for CJK fonts
* Use `font-weight: 700;` for mobile support
* Fix indentation
* Remove trailing whitespace
* Remove trailing whitespace
2017-12-07 16:01:52 +01:00
SerCom_KC
a1fc626e57
Fix font-weight of <strong> element for CJK fonts ( #5914 )
...
* Fix font-weight for CJK fonts
* Use `font-weight: 700;` for mobile support
* Fix indentation
* Remove trailing whitespace
* Remove trailing whitespace
2017-12-07 16:01:52 +01:00
Yamagishi Kazutoshi
87f1b249c1
Hide moved account's follow button in search result ( #5913 )
2017-12-07 15:59:31 +01:00
Yamagishi Kazutoshi
9a6fc03332
Hide moved account's follow button in search result ( #5913 )
2017-12-07 15:59:31 +01:00
Quenty31
57e0d88c19
OC language update ( #5905 )
...
* Update
* update
* Update oc.yml
* bundle exec i18n-tasks normalize
* Update oc.yml
2017-12-07 15:28:13 +09:00
Quenty31
7445f17571
OC language update ( #5905 )
...
* Update
* update
* Update oc.yml
* bundle exec i18n-tasks normalize
* Update oc.yml
2017-12-07 15:28:13 +09: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
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
9075094715
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 22:34:42 -06:00
David Yip
ddb61decce
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 22:34:42 -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
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
Jenkins
099159741b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
Jenkins
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
Yamagishi Kazutoshi
a7f20ed185
Remove duplicate annotate ( #5910 )
...
* Remove duplicate annotate
* Remove blank line
2017-12-07 04:53:42 +01:00
Yamagishi Kazutoshi
0c4ca3e549
Remove duplicate annotate ( #5910 )
...
* Remove duplicate annotate
* Remove blank line
2017-12-07 04:53:42 +01:00
Akihiko Odaki
ce3989fc6a
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
Akihiko Odaki
c083816c24
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
Yamagishi Kazutoshi
6bb4fb008a
Fix hide reblogs (regression from #5887 ) ( #5909 )
2017-12-07 03:37:31 +01:00
Yamagishi Kazutoshi
432761f375
Fix hide reblogs (regression from #5887 ) ( #5909 )
2017-12-07 03:37:31 +01:00
kibigo!
8dc8ea2c0a
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
kibigo!
2f2467ce8e
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
beatrix
65932b12c1
Merge pull request #240 from glitch-soc/copy-api-changes
...
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239 )
2017-12-06 19:59:15 -05:00
beatrix
de56209951
Merge pull request #240 from glitch-soc/copy-api-changes
...
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239 )
2017-12-06 19:59:15 -05: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
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
Jenkins
33fc1fbe2a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 00:17:14 +00:00
Jenkins
c63e6c9a2c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 00:17:14 +00:00
kibigo!
41f9a4d4e4
Fix common packs when other pack also there
2017-12-06 15:34:19 -08:00
kibigo!
061211a1e3
Fix common packs when other pack also there
2017-12-06 15:34:19 -08:00
David Yip
6a5ba9d129
Use settings pack for InvitesController ( #229 )
2017-12-06 17:20:04 -06:00
David Yip
161d286df2
Use settings pack for InvitesController ( #229 )
2017-12-06 17:20:04 -06:00
beatrix
f0b37f92a9
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
beatrix
81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
David Yip
63c41247ff
Prepend check_enabled_deletion to Settings::DeletesController ( #229 )
...
The specs for Settings::DeletesController include an example that
sets Settings.open_deletion to false and expects the "if deletion is not
available, redirect to root" logic to run. However, this spec does not
set up a user, which means that the spec (intentionally or otherwise)
expects this redirection to work with unauthenticated access.
We should preserve that behavior. To do so, we prepend the deletion
check to the action chain set up by Settings::BaseController, so that
said check occurs before the authenticate_user! check.
2017-12-06 16:19:43 -06:00