me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39694 commits 2 branches 0 tags 429 MiB
Commit graph

39694 commits

This branch
This branch
All branches
Author SHA1 Message Date
ncls7615
a16d885ac9
Improve scss refactor 3 2018-01-14 08:47:59 +09:00
ncls7615
090d7c1807 Improve scss refactor 2 2018-01-14 07:48:18 +09:00
ncls7615
5f35b39f6f
Improve scss refactor 2 2018-01-14 07:48:18 +09:00
ncls7615
4d9133003f Improve scss refactor 1 2018-01-14 07:18:50 +09:00
ncls7615
bb2ca23839
Improve scss refactor 1 2018-01-14 07:18:50 +09:00
ncls7615
75af54925a Fix padded-blocks error 2018-01-14 04:12:41 +09:00
ncls7615
a9be680807
Fix padded-blocks error 2018-01-14 04:12:41 +09:00
ncls7615
9e7150c6fa Initial scss refactor 2018-01-14 03:41:20 +09:00
ncls7615
6a73c8c8a2
Initial scss refactor 2018-01-14 03:41:20 +09:00
beatrix
a9bfc5b3c5 Merge pull request #324 from glitch-soc/load-public-on-admin 
Load public javascripts on admin pages
 2018-01-12 23:52:41 -05:00
beatrix
9526aababc
Merge pull request #324 from glitch-soc/load-public-on-admin 
Load public javascripts on admin pages
 2018-01-12 23:52:41 -05:00
Gô Shoemake
64f483cc0f load public.js on vanilla#admin 2018-01-12 18:52:53 -08:00
Gô Shoemake
3a0b47982d
load public.js on vanilla#admin 2018-01-12 18:52:53 -08:00
Gô Shoemake
056f52edac Load packs/public.js for glitch#admin 2018-01-12 18:51:52 -08:00
Gô Shoemake
9b9b7fa005
Load packs/public.js for glitch#admin 2018-01-12 18:51:52 -08:00
David Yip
430f9c37ea Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility' 2018-01-12 20:10:58 -06:00
David Yip
0210e59759
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility' 2018-01-12 20:10:58 -06:00
beatrix
7837d2c49f Merge pull request #322 from m4sk1n/glitch-soc-pl 
i18n: Update Polish translation
 2018-01-12 18:16:31 -05:00
beatrix
4773481a90
Merge pull request #322 from m4sk1n/glitch-soc-pl 
i18n: Update Polish translation
 2018-01-12 18:16:31 -05:00
Marcin Mikołajczak
6be6f6f5bd i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-12 23:08:51 +01:00
Marcin Mikołajczak
ee7217bc94 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-12 23:08:51 +01:00
David Yip
895a578030 Merge pull request #321 from KnzkDev/fix/dropdown-text 
Fix dropdown item text
 2018-01-12 09:09:10 -06:00
David Yip
e2ce628724
Merge pull request #321 from KnzkDev/fix/dropdown-text 
Fix dropdown item text
 2018-01-12 09:09:10 -06:00
ncls7615
327c9e96e0 Fix dropdown text 2018-01-12 23:18:25 +09:00
ncls7615
cf5789146b
Fix dropdown text 2018-01-12 23:18:25 +09:00
Jenkins
e6049e6fd0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-12 02:17:15 +00:00
Jenkins
9fa79bc317 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-12 02:17:15 +00:00
Jeong Arm
73b6f2ebe9 Handle sessions that can't be translated (#6245) 
* Handle sessions that can't be translated

This commit fixes #6165.

* Fix typo
 2018-01-12 02:44:28 +01:00
Jeong Arm
704053d221 Handle sessions that can't be translated (#6245) 
* Handle sessions that can't be translated

This commit fixes #6165.

* Fix typo
 2018-01-12 02:44:28 +01:00
David Yip
5ed533dffd Merge pull request #320 from glitch-soc/dockerfile-stack-space 
dockerfile: Give more stack space to /sbin/tini
 2018-01-11 04:25:26 -06:00
David Yip
8c08c852bc
Merge pull request #320 from glitch-soc/dockerfile-stack-space 
dockerfile: Give more stack space to /sbin/tini
 2018-01-11 04:25:26 -06:00
David Yip
b6d0dcc5d3 dockerfile: Give more stack space to /sbin/tini. 
/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default.  This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c,
as described in https://github.com/sass/node-sass/issues/2031.
 2018-01-11 04:09:16 -06:00
David Yip
f13ebd02c9
dockerfile: Give more stack space to /sbin/tini. 
/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default.  This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c,
as described in https://github.com/sass/node-sass/issues/2031.
 2018-01-11 04:09:16 -06:00
David Yip
31aad49ad6 Merge pull request #319 from glitch-soc/317-attempt-to-switch-flavors-raises-actioncontroller-parametermissing 
Fix #317: Attempting to switch flavors raises ActionController::ParameterMissing
 2018-01-10 12:49:43 -06:00
David Yip
26f054253c
Merge pull request #319 from glitch-soc/317-attempt-to-switch-flavors-raises-actioncontroller-parametermissing 
Fix #317: Attempting to switch flavors raises ActionController::ParameterMissing
 2018-01-10 12:49:43 -06:00
David Yip
53854707ce Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
David Yip
395e64e858
Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
David Yip
ec1199404c The flavour parameter is unused, so omit it (#317) 2018-01-10 12:09:42 -06:00
David Yip
514db316f7
The flavour parameter is unused, so omit it (#317) 2018-01-10 12:09:42 -06:00
David Yip
28e652d35d Allow for user object to be empty. Fixes #317. 
If a flavour has only one skin, the skin selector will be omitted.  This
omits the user[setting_skin] field, and because that's the only
user[...] field on the page, the entire user object will not be present
in the request handler's params object.

This commit accounts for that scenario by avoiding params.require(:user)
and instead picking out what we need from the params hash.
 2018-01-10 12:09:42 -06:00
David Yip
6fcb870d96
Allow for user object to be empty. Fixes #317. 
If a flavour has only one skin, the skin selector will be omitted.  This
omits the user[setting_skin] field, and because that's the only
user[...] field on the page, the entire user object will not be present
in the request handler's params object.

This commit accounts for that scenario by avoiding params.require(:user)
and instead picking out what we need from the params hash.
 2018-01-10 12:09:42 -06:00
David Yip
eecdc3e6a7 Add examples based on errors seen in #317 2018-01-10 12:09:41 -06:00
David Yip
3ce1385b25
Add examples based on errors seen in #317 2018-01-10 12:09:41 -06:00
David Yip
dbf88612e3 Merge pull request #316 from glitch-soc/fix-async 
Fix glitch async chunks
 2018-01-09 18:30:45 -06:00
David Yip
095a00ef3d
Merge pull request #316 from glitch-soc/fix-async 
Fix glitch async chunks
 2018-01-09 18:30:45 -06:00
kibigo!
c4d63ba442 Renamed glitch async chunks 2018-01-09 16:26:14 -08:00
kibigo!
35be02f21d Renamed glitch async chunks 2018-01-09 16:26:14 -08:00
David Yip
7852fc7706 Merge pull request #314 from chriswmartin/merge-vanilla-updates-2 
Merge vanilla updates into glitch - round 2
 2018-01-09 17:01:23 -06:00
David Yip
622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2 
Merge vanilla updates into glitch - round 2
 2018-01-09 17:01:23 -06:00
David Yip
1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	db/schema.rb
 2018-01-09 14:16:45 -06:00