e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06: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
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
7a45d382ea
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
2017-11-24 13:14:31 +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
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
2a5af9c10c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
fc2155019b
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01: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
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
3d1d3d9a20
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +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
b380e9d2cb
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01: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
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
a618df7998
Sets default theme to glitch
2017-11-17 19:32:04 -08: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
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
dc6e031364
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
f6bc6399e2
Add Japanese translation for DM block option. ( #5704 )
2017-11-15 03:57:09 +01:00
546257bc7f
Allow specifying STATSD_NAMESPACE ( #5700 )
2017-11-15 07:22:43 +09:00
fbef909c2a
Add option to block direct messages from people you don't follow ( #5669 )
...
* Add option to block direct messages from people you don't follow
Fix #5326
* If the DM responds to a toot by recipient, allow it through
* i18n: Update Polish translation (for #5669 ) (#5673 )
2017-11-14 21:12:57 +01:00
c3ec1e87b8
Updating Chinese (Simplified) translations ( #5643 )
...
* i18n: (zh-CN) Bug fix for note-counter.
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add support.array key for better wording
* Revert "i18n: (zh-CN) Add support.array key for better wording"
This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.
* i18n: (zh-CN) Change `客户端` to `应用`
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations (#5635 )
* i18n: (zh-CN) Change `两步验证` to `双重认证`
* i18n: (zh-CN) Improve translations
2017-11-14 20:44:42 +01:00
8087aa83d4
i18n: Update Polish translation ( #5699 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14 20:36:11 +01:00
249b0fe107
Add Japanese translations for moderator roles and its own admin actions. ( #5689 )
2017-11-14 15:53:14 +09:00
a6682a3000
i18n: fix typo in Polish translation ( #5688 )
2017-11-14 15:52:32 +09:00
0e6c4cb796
l10n: PT-BR translation updated ( #5681 )
...
* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated
2017-11-14 11:07:38 +09:00
252d0fe020
Fix #5652 - Notify too short when abbrev in JA ( #5664 )
...
* Fix #5652 - Notify too short when abbrev in JA
Fix #5652 of the notification message to be understandable when abbreviated.
* Changed quotes as original
Double quote to single and single quote as none. But I am not convinced of this fix.
* Added a single quote as YAMLlint's suggestion
* `bundle exec i18n-tasks normalize`
2017-11-12 16:51:47 +09:00
fcb9533549
i18n: Update Polish translation (for #5635 ) ( #5661 )
...
* i18n: Update Polish translation (for #5635 )
* 😑 🔫
2017-11-11 22:31:20 +01:00
7bb8b0b2fc
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
2017-11-11 20:23:33 +01:00
e5aa4128f6
Update en.yml ( #5648 )
...
Changed "Toots with replies" to read "Toots and replies"
2017-11-10 02:58:33 +01:00
cfd7b7a0b7
i18n: Update Polish translation ( #5639 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-09 14:23:06 +01:00
36376b5e23
Translate ja ( #5637 )
2017-11-09 14:22:55 +01:00
eb97bd8af6
i10n OC: Memorial ( #5615 ) + #5467 ( #5623 )
...
* Changed ĩ => ï
* Changed ĩ => ï
* Add ability to disable login and mark accounts as memorial (#5615 )
2017-11-08 15:19:49 +01:00
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
cbbeec05be
Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) ( #5617 )
2017-11-07 19:06:30 +01:00
b6e2e999bd
Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )
...
* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy
2017-11-07 14:49:32 +01:00
David Yip