abcang
|
269a445c0b
|
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 |
|
sdukhovni
|
2b51b4094c
|
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 |
|
ysksn
|
1104ac35d3
|
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 |
|
abcang
|
a78f66c069
|
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 |
|
ysksn
|
8c0e77d688
|
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 |
|
mayaeh
|
7a45d382ea
|
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 |
|
Akihiko Odaki
|
5a551b530a
|
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 |
|
Jenkins
|
167fe2ab08
|
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 |
|
Eugen Rochko
|
e84fecb7e9
|
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 |
|
Jenkins
|
faad820458
|
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 |
|
Devon Blandin
|
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 |
|
Jenkins
|
96302f7fd4
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-11-23 02:17:12 +00:00 |
|
Jenkins
|
41c71565c2
|
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 |
|
SerCom_KC
|
bc4a726c24
|
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!
|
2585649b20
|
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!
|
12c0011fee
|
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 |
|
kibigo!
|
8812bab687
|
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 |
|
Jenkins
|
2a5af9c10c
|
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 |
|
Marcin Mikołajczak
|
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 |
|
mayaeh
|
9841d20c97
|
Add Japanese translations. (#5769)
|
2017-11-21 17:11:33 +01:00 |
|
mayaeh
|
fc2155019b
|
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 |
|
beatrix
|
b7a7eb84dd
|
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 |
|
Marcin Mikołajczak
|
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 |
|
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 |
|
Joan Montané
|
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 |
|
kibigo!
|
8aeda4f064
|
Finalized theme loading and stuff
|
2017-11-20 22:13:37 -08:00 |
|
kibigo!
|
bdbbd06dad
|
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 |
|
Jenkins
|
8f3e5f6128
|
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 |
|
ysksn
|
6f609dc4b4
|
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 |
|