Jenkins
0d8023f768
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 21:17:14 +00:00
Devon Blandin
cbeb60ffc8
Disable Code Climate maintainability checks ( #5798 )
...
- Migrate `.codeclimate.yml` to version 2 structure
- Disable Code Climate [maintainability checks][]
https://docs.codeclimate.com/docs/advanced-configuration
[maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment
This commit upgrades the Code Climate configuration file and disables
the new maintainability checks.
Once this PR is merged, we can experiment with the new checks via pull
requests (the PR will report new issues) or via the [Code Climate
CLI][cli], which [now also supports the new maintainability
checks][cli-support].
[cli]: https://github.com/codeclimate/codeclimate
[cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c
2017-11-23 21:38:17 +01:00
Jenkins
96302f7fd4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
SerCom_KC
97bb620b48
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
2017-11-23 02:49:21 +01:00
kibigo!
3860750d5d
Styling fixes
2017-11-21 19:00:07 -08:00
kibigo!
ea77b60648
Update statuses on hidden toggle ( Fixes #227 )
2017-11-21 18:27:34 -08:00
kibigo!
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
Jenkins
a2e4d79b1c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
Marcin Mikołajczak
c75bc101ba
i18n: Update Polish translation - front-end added ( #231 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 17:53:13 +01:00
mayaeh
9841d20c97
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01:00
beatrix
dbafce8535
update code of conduct email address
2017-11-21 11:01:28 -05:00
Marcin Mikołajczak
00be86c25d
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 16:36:22 +01:00
Joan Montané
daec402a58
Update and fix Catalan translation ( #5773 )
...
* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 23:17:28 +09:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
Jenkins
1c33bd3d3a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 05:17:12 +00:00
ysksn
4086db0929
Add tests for Remotable ( #5768 )
2017-11-21 13:59:36 +09:00
abcang
4e409e629d
Fixed duplicating URL of photo type of oEmbed ( #5763 )
2017-11-20 20:45:54 +01:00
Jenkins
9c9b105d43
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-19 15:17:12 +00:00
abcang
ef14321fff
Fix NoMethodError at ActivityPub::FetchRemoteStatusService ( #5753 )
2017-11-19 15:33:15 +01:00
abcang
defb2fd0b0
Fix N+1 at notification ( #5752 )
2017-11-19 15:32:48 +01:00
David Yip
cd2d8dc4a4
Update .following_map examples with show-reblogs information.
2017-11-19 02:56:45 -06:00
David Yip
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
mayaeh
52111769d0
i18n: Update ja translation for moderator badge. ( #5731 )
...
* Update Japanese translation for moderator badge.
* Follows English notation
2017-11-19 04:16:56 +01:00
ysksn
42cb1425c6
Add tests for AccountInteractions ( #5751 )
...
* Add tests for class methods of AccountInteractions
* Add tests for instance methods of AccountInteractions
2017-11-19 04:16:14 +01:00
Lynx Kotoura
8a8bea2e53
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +01:00
ysksn
a7d85563bd
Add a test for Settings::Extend#settings ( #5720 )
2017-11-19 04:15:32 +01:00
ysksn
c09c37af98
Add tests for Status#title ( #5718 )
2017-11-19 04:15:17 +01:00
Yamagishi Kazutoshi
bffc1b880b
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
2017-11-19 04:13:57 +01:00
beatrix
34ba45e47c
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!
e56a32a46b
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
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
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
beatrix
27ca589183
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
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
Baptiste Gelez
51b2f7d79e
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!
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
