kibigo!
bc4fa6b198
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
kibigo!
d216547382
Fixed typos
2017-12-03 22:30:45 -08:00
kibigo!
541fe9b110
Skins support
2017-11-30 19:29:47 -08:00
kibigo!
8812bab687
Minor fixes
2017-11-21 18:17:38 -08:00
kibigo!
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
kibigo!
321fa41930
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
kibigo!
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
kibigo!
92cc79be72
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
kibigo!
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
kibigo!
672ace5a20
Media styling
2017-11-18 11:05:23 -08:00
kibigo!
f51f7b0e06
Font styles are now packagified
2017-11-18 11:05:00 -08:00
kibigo!
a618df7998
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
kibigo!
fc2c8b50dd
Removed glitch tests
2017-11-17 19:29:17 -08:00
kibigo!
e19fc6a9f8
Restore vanilla components
2017-11-17 19:29:16 -08:00
kibigo!
45c44989c8
Forking glitch theme
2017-11-17 19:29:16 -08:00
beatrix
5a9982b425
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
...
Make character limit configurable (from tootsuite/mastodon#5697 )
2017-11-17 19:02:40 -05:00
David Yip
284e2cde81
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06:00
David Yip
130aa90d55
Update annotations on Follow, FollowRequest, and Mute.
...
Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.
2017-11-17 17:41:15 -06:00
David Yip
1ab12ba38e
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
Eugen Rochko
24cafd73a2
Lists ( #5703 )
...
* 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-18 00:16:48 +01:00
David Yip
6f8ccbfcdf
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (e28b33c.. 94c5a11
2017-11-17 14:35:16 -06:00
David Yip
dc16d73bf5
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17 14:28:16 -06:00
beatrix
b006bb82af
Merge pull request #221 from glitch-soc/local-only-policy
...
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17 15:17:49 -05:00
Jenkins
94c5a11cda
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
David Yip
45f18b8f49
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
2017-11-17 14:01:23 -06:00
Lynx Kotoura
4a2fc2d444
Increase contrast of Admin badges ( #5740 )
...
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17 19:59:53 +01:00
Clworld
e1ebf36352
Fix regression #5467 : fixes emoji copy ( #5739 )
2017-11-17 18:22:31 +01:00
Alex Coto
ae6dd08121
Change libinconv download URL to HTTPS ( #5738 )
2017-11-17 18:21:05 +01:00
David Yip
f6355f6ffb
Update StatusPolicy to check current_account for local_only? toots.
...
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-17 09:07:21 -06:00
unarist
e28b33c89c
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
David Yip
2a386ad88d
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -06:00
David Yip
fbf76feb37
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
2017-11-17 00:14:24 -06:00
David Yip
392945f9a3
Throw layout, isWide, navbarUnder back into mapStateToProps.
...
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-17 00:11:01 -06:00
kibigo!
4dd19054d6
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi
dc6e031364
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
ysksn
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Eugen Rochko
3e90987c8b
Fix some rubocop style issues ( #5730 )
2017-11-17 10:06:26 +09:00
Eugen Rochko
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Renato "Lond" Cerqueira
ad207456d6
Improve language filter ( #5724 )
...
* 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-16 13:51:38 +01:00
ysksn
9e3d24a150
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
2017-11-16 12:13:03 +01:00
Surinna Curtis
ee560abdbe
Merge pull request #216 from glitch-soc/merge-upstream-3023725
...
Merge upstream at commit 3023725
2017-11-16 01:38:26 -06:00
Surinna Curtis
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
ysksn
556c07df1f
Add tests for Status#verb ( #5717 )
2017-11-16 15:46:29 +09:00
David Yip
88627fd7aa
Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env
...
Allow streaming server to take bindhost from HOST env
2017-11-15 23:40:07 -06:00
Daggertooth
7e17e764a5
Allow streaming server to take bindhost from HOST env
2017-11-15 21:20:35 -06:00
ysksn
3023725936
Add tests for Status#hidden? ( #5719 )
2017-11-16 11:07:27 +09:00
beatrix
04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
...
Allow hiding reblogs on a per-follow basis
2017-11-15 12:01:17 -05:00
Daniel Hunsaker
3e4b01b47d
[Nanobox] Apply Release Notes Changes ( #5670 )
...
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-15 16:26:53 +01:00
