faad820458
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 21:17:14 +00:00
801eee0ff3
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
41c71565c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
bc4a726c24
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
2017-11-23 02:49:21 +01:00
2585649b20
Styling fixes
2017-11-21 19:00:07 -08:00
12c0011fee
Update statuses on hidden toggle ( Fixes #227 )
2017-11-21 18:27:34 -08:00
8812bab687
Minor fixes
2017-11-21 18:17:38 -08:00
2a5af9c10c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
3c83b7e06e
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
fc2155019b
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01:00
b7a7eb84dd
update code of conduct email address
2017-11-21 11:01:28 -05:00
1a07b83c69
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in >
2017-11-21 16:36:22 +01:00
53b7b81b43
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
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
8f3e5f6128
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 05:17:12 +00:00
6f609dc4b4
Add tests for Remotable ( #5768 )
2017-11-21 13:59:36 +09:00
3dce6cbbd7
Fixed duplicating URL of photo type of oEmbed ( #5763 )
2017-11-20 20:45:54 +01:00
a36a2c1796
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-19 15:17:12 +00:00
2bcc81700c
Fix NoMethodError at ActivityPub::FetchRemoteStatusService ( #5753 )
2017-11-19 15:33:15 +01:00
53e95c4efc
Fix N+1 at notification ( #5752 )
2017-11-19 15:32:48 +01:00
e45cb0837b
Update .following_map examples with show-reblogs information.
2017-11-19 02:56:45 -06:00
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
08deec4c84
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
2590aac863
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
3d1d3d9a20
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +01:00
8f638a2bf2
Add a test for Settings::Extend#settings ( #5720 )
2017-11-19 04:15:32 +01:00
9d9b1aff1e
Add tests for Status#title ( #5718 )
2017-11-19 04:15:17 +01:00
bfdcf76a64
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
bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
321fa41930
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
b380e9d2cb
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
92cc79be72
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
672ace5a20
Media styling
2017-11-18 11:05:23 -08:00
f51f7b0e06
Font styles are now packagified
2017-11-18 11:05:00 -08:00
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
dec960c828
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
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
2864e5e077
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
2017-11-18 04:44:19 +01:00
a618df7998
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
fc2c8b50dd
Removed glitch tests
2017-11-17 19:29:17 -08:00
e19fc6a9f8
Restore vanilla components
2017-11-17 19:29:16 -08:00
45c44989c8
Forking glitch theme
2017-11-17 19:29:16 -08:00
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
284e2cde81
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06:00
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
1ab12ba38e
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
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
