about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-11-30Skins supportkibigo!
2017-11-21Minor fixeskibigo!
2017-11-20Finalized theme loading and stuffkibigo!
2017-11-18Merge remote-tracking branch 'cybre/theme_win95' into glitch-themekibigo!
2017-11-18WIP static themeingkibigo!
2017-11-18Enabled vanilla thmeekibigo!
2017-11-18Public pack fixkibigo!
2017-11-18Media stylingkibigo!
2017-11-18Font styles are now packagifiedkibigo!
2017-11-17Sets default theme to glitchkibigo!
2017-11-17Removed glitch testskibigo!
2017-11-17Restore vanilla componentskibigo!
2017-11-17Forking glitch themekibigo!
2017-11-17Merge pull request #223 from ↵beatrix
glitch-soc/glitchsoc/feature/configurable-status-size Make character limit configurable (from tootsuite/mastodon#5697)
2017-11-17Merge pull request #224 from yipdw/merge-upstreamDavid Yip
Merge upstream (tootsuite/mastodon#5703)
2017-11-17Update annotations on Follow, FollowRequest, and Mute.David Yip
Follow and FollowRequest had conflicts in their schema annotations, so I ran latest migrations and let annotate_models fix them up.
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
* Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests
2017-11-17Merge pull request #222 from yipdw/merge/tootsuite/masterDavid Yip
Merge upstream (e28b33c.. 94c5a11)
2017-11-17Merge remote-tracking branch ↵David Yip
'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17Merge pull request #221 from glitch-soc/local-only-policybeatrix
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-17Merge pull request #218 from glitch-soc/themed-prefetchingDavid Yip
Themed preloading
2017-11-17Increase contrast of Admin badges (#5740)Lynx Kotoura
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17Fix regression #5467: fixes emoji copy (#5739)Clworld
2017-11-17Change libinconv download URL to HTTPS (#5738)Alex Coto
2017-11-17Update StatusPolicy to check current_account for local_only? toots.David Yip
StatusPolicy#account was renamed to StatusPolicy#current_account in upstream. This commit renames the local-only changes to match and augments the #show? policy spec with what we expect for local-only toots.
2017-11-17Move "Permissions" row into main table in /admin/accounts/:id (#5734)unarist
2017-11-17Add trailing comma in mapStateToPropsDavid Yip
Consistency, eslint, etc.
2017-11-17Merge pull request #219 from glitch-soc/no-spinDavid Yip
Remove 'spin' theme
2017-11-17Throw layout, isWide, navbarUnder back into mapStateToProps.David Yip
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-16Removes spin themekibigo!
2017-11-16Themed prefetchingkibigo!
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Redirect to reports when moderator (#5733)Yamagishi Kazutoshi
2017-11-17Remove empty strings (#5732)ysksn
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-17Display moderator badge (green), admin badge changed to red (#5728)Eugen Rochko
2017-11-16Improve language filter (#5724)Renato "Lond" Cerqueira
* Scrub text of html before detecting language. * Detect language on statuses coming from activitypub. * Fix rubocop comments. * Remove custom emoji from text before language detection
2017-11-16Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)ysksn
2017-11-16Merge pull request #216 from glitch-soc/merge-upstream-3023725Surinna Curtis
Merge upstream at commit 3023725
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-16Add tests for Status#verb (#5717)ysksn
2017-11-15Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-envDavid Yip
Allow streaming server to take bindhost from HOST env
2017-11-15Allow streaming server to take bindhost from HOST envDaggertooth
2017-11-16Add tests for Status#hidden? (#5719)ysksn
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
Allow hiding reblogs on a per-follow basis
2017-11-15[Nanobox] Apply Release Notes Changes (#5670)Daniel Hunsaker
Apparently I missed some things in earlier commits/releases that needed to be applied to the Nanobox setup. All minor things, nothing that breaks anything, but still best to get them in place. - Move cron jobs to their own component, so the Sidekiq component can be scaled up to multiple instances without causing issues with running the same cron job multiple times at once. - Update cron jobs to the latest requirements, removing extraneous ones - Add new variables to `.env.nanobox` - Update Nginx to use correct cache header directives
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
* Move some tests of User into Settings::ScopedSettings * Add a test for User@settings
2017-11-15Add a test for Tag#to_param (#5705)ysksn
generated by cgit-pink (git 2.37.1) at 2024-07-05 16:05:05 +0000