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

5569 Commits

Author SHA1 Message Date
kibi! 8ee6ed358f Increase priority of favstar gold 2018-01-14 16:05:44 -08:00
kibi! 1ee0e91fb6 Fixes to notification styling 2018-01-14 15:48:54 -08:00
kibi! b9f4896830 Fixes to drawer and CWs 2018-01-14 15:31:00 -08:00
beatrix cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor 
SCSS Refactor
 2018-01-14 17:48:02 -05:00
beatrix 39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend 
Add glitchy elephant friend
 2018-01-14 17:40:27 -05:00
kibi! 0fb3bd09e9 Oops this should have been a part of last commit 2018-01-14 14:21:41 -08:00
kibi! 1fa03e026a Fixes onboarding modal (#318) 2018-01-14 14:13:24 -08:00
kibi! a5931e1f48 Fixed autocollapse detection 2018-01-14 13:29:51 -08:00
David Yip c2669f93d0
Fix eslint errors. #294. 2018-01-14 05:56:43 -06:00
David Yip 756a9cd139
Run slightly less afoul of accessibility checks. #294. 
This makes the clickable element an interactive element, but doesn't add
alt text and makes it not-obvious that you can click the elefriend.  On
one hand, this goes against good practice; on the other hand, it's not
*supposed* to be obvious that you can click the elefriend.
 2018-01-14 05:07:08 -06:00
David Yip e64cc311dd
Introduce a bit of luck into the elefriend selection. #294. 2018-01-14 04:46:21 -06:00
David Yip 53cbc9933e
Add wave background; blend elefriend in a bit more. #294. 2018-01-14 04:00:21 -06:00
David Yip cd1377de7f
Bind click event to elefriend cycling. #294. 2018-01-14 03:35:25 -06:00
David Yip 1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294. 
Also lay some groundwork needed to interactively change the
glitchfriend.

The codebase uses "elefriend" because it's shorter and didn't require me
to realign the actions in actions/compose.js.  Same idea, though.
 2018-01-14 03:06:11 -06:00
David Yip 1e0b707018
Add the shrinking glitchy elefriend. #294. 2018-01-13 21:27:39 -06:00
David Yip 835eec8a4c
Prototype out glitchy elephant friend. #294. 
Glitched elephant friends kindly provided by @ncls7615.
 2018-01-13 21:27:14 -06:00
ncls7615 f9b08e2142
Fix collapsed toot style 2018-01-14 11:13:55 +09:00
ncls7615 1ebe66b78c
Fix un-fullwidth media style 2018-01-14 11:07:32 +09:00
ncls7615 be2bac05aa
Fix media detailed style 2018-01-14 10:38:51 +09:00
ncls7615 b5476f6c75
Fix confirmation modal bug 2018-01-14 09:51:01 +09:00
ncls7615 bc0524834e
Fix letterbox bug 2018-01-14 09:25:35 +09:00
ncls7615 6ecf81cacf
Improve scss refactor 5 2018-01-14 09:17:38 +09:00
ncls7615 64425dbb77
Improve scss refactor 4 2018-01-14 09:12:10 +09:00
ncls7615 a16d885ac9
Improve scss refactor 3 2018-01-14 08:47:59 +09:00
ncls7615 5f35b39f6f
Improve scss refactor 2 2018-01-14 07:48:18 +09:00
ncls7615 bb2ca23839
Improve scss refactor 1 2018-01-14 07:18:50 +09:00
ncls7615 a9be680807
Fix padded-blocks error 2018-01-14 04:12:41 +09:00
ncls7615 6a73c8c8a2
Initial scss refactor 2018-01-14 03:41:20 +09: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 3a0b47982d
load public.js on vanilla#admin 2018-01-12 18:52:53 -08:00
Gô Shoemake 9b9b7fa005
Load packs/public.js for glitch#admin 2018-01-12 18:51:52 -08:00
David Yip 0210e59759
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility' 2018-01-12 20:10:58 -06: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 ee7217bc94 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-12 23:08:51 +01: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 cf5789146b
Fix dropdown text 2018-01-12 23:18:25 +09:00
Jenkins 9fa79bc317 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-12 02:17:15 +00: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 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 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 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 395e64e858
Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
David Yip 514db316f7
The flavour parameter is unused, so omit it (#317) 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 3ce1385b25
Add examples based on errors seen in #317 2018-01-10 12:09:41 -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! 35be02f21d Renamed glitch async chunks 2018-01-09 16:26:14 -08: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 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	db/schema.rb
 2018-01-09 14:16:45 -06:00
Eugen Rochko 35b84985a8
Skip ActivityPub Announces of non-public objects (#6230) 
* Skip ActivityPub Announces of non-public objects

* Skip OStatus reblogs of non-public statuses
 2018-01-09 19:35:10 +01:00