kibigo!
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
kibigo!
cc70ca9b76
Fixed typos
2017-12-03 22:30:45 -08:00
kibigo!
36b9f4df56
Skins support
2017-11-30 19:29:47 -08:00
kibigo!
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
kibigo!
2b05c3aaa1
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
kibigo!
e56a32a46b
WIP static themeing
2017-11-18 15:12:52 -08:00
kibigo!
25361848e3
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
kibigo!
f0aedba604
Public pack fix
2017-11-18 11:05:39 -08:00
kibigo!
a8c0c7a2c1
Media styling
2017-11-18 11:05:23 -08:00
kibigo!
0c90d1ab38
Font styles are now packagified
2017-11-18 11:05:00 -08:00
kibigo!
b8fdcfd55e
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
kibigo!
5466150ea4
Removed glitch tests
2017-11-17 19:29:17 -08:00
kibigo!
7c5614c667
Restore vanilla components
2017-11-17 19:29:16 -08:00
kibigo!
68304a6ce5
Forking glitch theme
2017-11-17 19:29:16 -08:00
beatrix
61585f2c42
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
7db0145d21
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06:00
David Yip
08751360a0
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
f1279d8ff3
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
Eugen Rochko
e149067561
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
ce27681a76
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (5982d57.. 065e238
2017-11-17 14:35:16 -06:00
David Yip
e5a2158e2a
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17 14:28:16 -06:00
beatrix
57e301c5be
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
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
David Yip
87c1f91505
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
2017-11-17 14:01:23 -06:00
Lynx Kotoura
731c859097
Increase contrast of Admin badges ( #5740 )
...
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17 19:59:53 +01:00
Clworld
6547ebee48
Fix regression #5467 : fixes emoji copy ( #5739 )
2017-11-17 18:22:31 +01:00
Alex Coto
eaf6f94773
Change libinconv download URL to HTTPS ( #5738 )
2017-11-17 18:21:05 +01:00
David Yip
bcdd0f8b9d
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
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
David Yip
ff4e474bcd
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -06:00
David Yip
c687853d80
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
2017-11-17 00:14:24 -06:00
David Yip
801ecbfa5a
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!
bbef750b04
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi
b80a35092e
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
ysksn
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Eugen Rochko
3df46ce5a8
Fix some rubocop style issues ( #5730 )
2017-11-17 10:06:26 +09:00
Eugen Rochko
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Renato "Lond" Cerqueira
f366a83c6c
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
bf1d4a2cb9
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
2017-11-16 12:13:03 +01:00
Surinna Curtis
96f629193f
Merge pull request #216 from glitch-soc/merge-upstream-ab48f2b
...
Merge upstream at commit ab48f2b
2017-11-16 01:38:26 -06:00
Surinna Curtis
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
ysksn
a766ece166
Add tests for Status#verb ( #5717 )
2017-11-16 15:46:29 +09:00
David Yip
ed9254c4e9
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
3bcaa27a99
Allow streaming server to take bindhost from HOST env
2017-11-15 21:20:35 -06:00
ysksn
ab48f2b239
Add tests for Status#hidden? ( #5719 )
2017-11-16 11:07:27 +09:00
beatrix
ed1cf698a2
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
fc2366daf3
[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
