1c5b0e3334
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
740f8a95a9
Add consumable invites ( #5814 )
...
* Add consumable invites
* Add UI for generating invite codes
* Add tests
* Display max uses and expiration in invites table, delete invite
* Remove unused column and redundant validator
- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
checks invite code validity
* Add admin setting to disable invites
* Add admin UI for invites, configurable role for invite creation
- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to
* Do not remove invites from database, expire them instantly
2017-11-27 16:07:59 +01:00
5de42665d7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
0ea4478b68
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
fd87e5a53b
Do not filter the status collection after muting and blocking ( #5815 )
...
Filtering the status collection wipes out even the profiles of muted and
blocked accounts. However, the behavior is inconsistent with the server-
side behavior.
2017-11-26 01:45:17 +01:00
57fe4102ea
i18n: (zh-CN) Add translations for #5746 & #5750 ( #5816 )
2017-11-26 02:38:40 +09:00
bf7757cbbc
Allow to open a modal for embedded photo ( #5777 )
2017-11-25 15:41:45 +01:00
1266c66f79
Rename ariaLabel property of Dropdown to title ( #5813 )
...
DropdownMenu has ariaLabel property, but it is actually applied to title
property of IconButton. Keep it consistent.
2017-11-25 15:41:08 +01:00
d07983b56d
Updated Catalan strings ( #5801 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
2017-11-25 23:22:59 +09:00
86f4f8e158
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-25 05:17:15 +00:00
662b8eefe8
Change navigation link for moderators ( #5812 )
2017-11-25 05:53:54 +01:00
520d147803
Add Japanese translations ( #5810 )
...
* yarn manage:translations
* Add Japanese translation for #5087
* Add Japanese translation for #5616
* Add Japanese translation for #5746
* Add Japanese translation for #5750
2017-11-25 03:39:57 +01:00
32987004c9
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
31ac5f0e00
Display list column ( #5750 )
2017-11-25 00:35:37 +01:00
269a445c0b
Fix unnecessary order ( #5807 )
2017-11-24 18:41:07 +01:00
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
1104ac35d3
Add tests for Streamable ( #5771 )
2017-11-24 14:42:57 +01:00
a78f66c069
Add index of account and reblog to statuses ( #5785 )
2017-11-24 14:42:09 +01:00
8c0e77d688
Add tests for AccountRelationshipsPresenter ( #5805 )
2017-11-24 14:41:04 +01:00
7a45d382ea
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
2017-11-24 13:14:31 +01:00
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
167fe2ab08
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
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
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
Yamagishi Kazutoshi