9a930c0623
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
2017-11-24 13:14:31 +01:00
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
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
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
0d8023f768
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 21:17:14 +00:00
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
96302f7fd4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
97bb620b48
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
2017-11-23 02:49:21 +01:00
3860750d5d
Styling fixes
2017-11-21 19:00:07 -08:00
ea77b60648
Update statuses on hidden toggle ( Fixes #227 )
2017-11-21 18:27:34 -08:00
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
a2e4d79b1c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
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
9841d20c97
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01:00
dbafce8535
update code of conduct email address
2017-11-21 11:01:28 -05:00
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
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
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
1c33bd3d3a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 05:17:12 +00:00
4086db0929
Add tests for Remotable ( #5768 )
2017-11-21 13:59:36 +09:00
4e409e629d
Fixed duplicating URL of photo type of oEmbed ( #5763 )
2017-11-20 20:45:54 +01:00
9c9b105d43
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-19 15:17:12 +00:00
ef14321fff
Fix NoMethodError at ActivityPub::FetchRemoteStatusService ( #5753 )
2017-11-19 15:33:15 +01:00
defb2fd0b0
Fix N+1 at notification ( #5752 )
2017-11-19 15:32:48 +01:00
cd2d8dc4a4
Update .following_map examples with show-reblogs information.
2017-11-19 02:56:45 -06:00
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
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
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
8a8bea2e53
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +01:00
a7d85563bd
Add a test for Settings::Extend#settings ( #5720 )
2017-11-19 04:15:32 +01:00
c09c37af98
Add tests for Status#title ( #5718 )
2017-11-19 04:15:17 +01:00
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
34ba45e47c
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
2b05c3aaa1
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
e56a32a46b
WIP static themeing
2017-11-18 15:12:52 -08:00
1f5f446f08
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
25361848e3
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
f0aedba604
Public pack fix
2017-11-18 11:05:39 -08:00
a8c0c7a2c1
Media styling
2017-11-18 11:05:23 -08:00
0c90d1ab38
Font styles are now packagified
2017-11-18 11:05:00 -08:00
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
27ca589183
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
cea7dec340
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
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
51b2f7d79e
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
2017-11-18 04:44:19 +01:00
b8fdcfd55e
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
5466150ea4
Removed glitch tests
2017-11-17 19:29:17 -08:00
7c5614c667
Restore vanilla components
2017-11-17 19:29:16 -08:00
68304a6ce5
Forking glitch theme
2017-11-17 19:29:16 -08:00
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
mayaeh