beatrix
bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
kibigo!
2b05c3aaa1
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
kibigo!
321fa41930
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!
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
Marcin Mikołajczak
1f5f446f08
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
Marcin Mikołajczak
b380e9d2cb
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
kibigo!
25361848e3
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
kibigo!
92cc79be72
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!
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
kibigo!
a8c0c7a2c1
Media styling
2017-11-18 11:05:23 -08:00
kibigo!
672ace5a20
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!
f51f7b0e06
Font styles are now packagified
2017-11-18 11:05:00 -08:00
Eugen Rochko
b89f614bd7
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
2017-11-18 19:39:02 +01:00
Eugen Rochko
58cede4808
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
2017-11-18 19:39:02 +01:00
beatrix
27ca589183
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
beatrix
dec960c828
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
Jenkins
cea7dec340
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
Jenkins
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
SerCom_KC
e618b6c136
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
2017-11-18 14:35:11 +09:00
SerCom_KC
6be72a3ec6
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
2017-11-18 14:35:11 +09:00
Baptiste Gelez
51b2f7d79e
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
2017-11-18 04:44:19 +01:00
Baptiste Gelez
2864e5e077
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
2017-11-18 04:44:19 +01:00
kibigo!
b8fdcfd55e
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
kibigo!
a618df7998
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!
fc2c8b50dd
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!
e19fc6a9f8
Restore vanilla components
2017-11-17 19:29:16 -08:00
kibigo!
68304a6ce5
Forking glitch theme
2017-11-17 19:29:16 -08:00
kibigo!
45c44989c8
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
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
7db0145d21
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06: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
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
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
f1279d8ff3
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
David Yip
1ab12ba38e
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
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
ce27681a76
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (5982d57.. 065e238
2017-11-17 14:35:16 -06: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
e5a2158e2a
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17 14:28: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
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
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
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
