treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
5,279 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

5279 Commits (601f0fe4a3f9e0f00ab27c93e02c149dbfdfa10e)

Author SHA1 Message Date
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789) 
this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.
 2017-11-25 01:36:08 +01:00
Eugen Rochko bf8eab12ba Display list column (#5750) 2017-11-25 00:35:37 +01:00
abcang 3db3ca1258 Fix unnecessary order (#5807) 2017-11-24 18:41:07 +01:00
sdukhovni 019c39bf1d Don't remove originals of boosted toots from timeline (#5479) 
* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline
 2017-11-24 14:43:53 +01:00
ysksn 4dd95c79a5 Add tests for Streamable (#5771) 2017-11-24 14:42:57 +01:00
abcang 17bde15f53 Add index of account and reblog to statuses (#5785) 2017-11-24 14:42:09 +01:00
ysksn 5dd8a36c09 Add tests for AccountRelationshipsPresenter (#5805) 2017-11-24 14:41:04 +01:00
mayaeh 9a930c0623 i18n: Update ja translations (#5804) 
* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.
 2017-11-24 13:14:31 +01:00
Akihiko Odaki 0319b92979 Do not require onClose property in NavigationBar (#5802) 
NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.
 2017-11-24 13:13:17 +01:00
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-24 01:17:20 +00:00
Eugen Rochko efc97d404c Add logging of admin actions (#5757) 
* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation (#5782)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 (#5795)

* Add color coding to audit log

* Change dismiss->resolve, log all outcomes of report as resolve

* Update terminology (e-mail blacklist) (#5796)

* Update terminology (e-mail blacklist)

imho looks better

* Update en.yml

* Fix code style issues

* i18n-tasks normalize
 2017-11-24 02:05:53 +01:00
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