aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,223 Commits
134 Branches
281 Tags
1.0 GiB
Commit Graph

11 Commits (6ba52306f9d2611a06326445230b54c156c37e53)

Author SHA1 Message Date
Eugen Rochko ed099d8bdc
Change account suspensions to be reversible by default ()
ThibG cb62a83a71 Add invite comments ()
ThibG 92569ffde8 Fix invites not being disabled upon account suspension () 
* Disable invite links from disabled/suspended users

* Add has_many invites relationship to users

* Destroy unused invites when suspending an account
Eugen Rochko cdb101340a
Keyword/phrase filtering () 
* Add keyword filtering

    GET|POST       /api/v1/filters
    GET|PUT|DELETE /api/v1/filters/:id

- Irreversible filters can drop toots from home or notifications
- Other filters can hide toots through the client app
- Filters use a phrase valid in particular contexts, expiration

* Make sure expired filters don't get applied client-side

* Add missing API methods

* Remove "regex filter" from column settings

* Add tests

* Add test for FeedManager

* Add CustomFilter test

* Add UI for managing filters

* Add streaming API event to allow syncing filters

* Fix tests
Eugen Rochko ca85658975
Add autofollow option to invites () 
* Add autofollow option to invites

* Trigger CodeClimate rebuild
Yamagishi Kazutoshi 9613a53cb3 Update dependencies for Ruby (2018-04-23) () 
* Update annotate to version 2.7.3

* Update aws-sdk-s3 to version 1.9.2

* Update browser to version 2.5.3

* Update capistrano to version 3.10.2

* Update domain_name to version 0.5.20180417

* Update http to version 3.2.0

* Update lograge to version 0.10.0

* Update oj to version 3.5.1

* Update parallel_tests to version 2.21.3

* Update puma to version 3.11.4

* Update rubocop to version 0.55.0

* Update scss_lint to version 0.57.0

* Update simplecov to version 0.16.1

* Update tty-command to version 0.8.0

* Update tty-prompt to version 0.16.0

* Update pkg-config to version 1.3.0

* Update fog-local to version 0.5.0

* Update fog-openstack to version 0.1.25

* Update devise-two-factor to version 3.0.3

* bundle update
Akihiko Odaki 67f7ffa792 Change user_id column non-nullable ()
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true ()
Yamagishi Kazutoshi 74320971e2 Add invite filter ()
Yamagishi Kazutoshi 15fab79cfa Show "expired" in invite index () 
* Show "expired" in invite index

* "Force expire" -> "Deactivate"
Eugen Rochko 740f8a95a9
Add consumable invites () 
* 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