53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234 .
...
The class helps out with keyword mutes, not just some general concept of
"filtering".
7 years ago
d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234 .
...
Also add HTML entity decoding to Glitch::FilterHelper, which is needed
to e.g. match "<" to the tag-stripped version of "<p><3</p>" or
"<p><3</p>".
7 years ago
29b5b46c87
Strip HTML from keyword mute input. #234 .
7 years ago
a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
7 years ago
38e0133e1b
Make PAM gem optional, allow configuration over environment ( #6415 )
7 years ago
4e4f1b0dcb
Add option to show only local toots in timeline preview ( #6292 )
...
* Add option to show only local toots in timeline preview
Right know, toots from all the known fediverse are shown in the main
page of an instance. That however doesn't reflect the instance itself.
With this option the admin may choose to display only local toots so
that users checking the instance get a better idea of internal
conversations.
* Fix issues pointed by codeclimate and eslint
* Add default message for community timeline
* Update pl.yml
7 years ago
26f21fd5a0
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
7 years ago
4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
04fef7b888
pam authentication ( #5303 )
...
* add pam support, without extra column
* bugfixes for pam login
* document options
* fix code style
* fix codestyle
* fix tests
* don't call remember_me without password
* fix codestyle
* improve checks for pam usage (should fix tests)
* fix remember_me part 1
* add remember_token column because :rememberable requires either a password or this column.
* migrate db for remember_token
* move pam_authentication to the right place, fix logic bug in edit.html.haml
* fix tests
* fix pam authentication, improve username lookup, add comment
* valid? is sometimes not honored, return nil instead trying to authenticate with pam
* update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests
* update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user
* codeconvention fixes
* code convention fixes
* fix idention
* update dependency, explicit conflict check
* fix disabled password updates if in pam mode
* fix check password if password is present, fix templates
* block registration if account is maintained by pam
* Revert "block registration if account is maintained by pam"
This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20.
* fix identation error introduced by rebase
* block usernames maintained by pam
* document pam settings better
* fix code style
7 years ago
0e10667fbe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1cc44cba81
Fix #6331 ( #6341 )
...
UserTrackingConcern is circumvented by SessionsController#create
because it calls warden, which calls the User#update_tracked_fields!
method directly. Move returning user logic to that method.
7 years ago
613e7c7521
Rename ResolveRemoteAccountService to ResolveAccountService ( #6327 )
...
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
7 years ago
2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
7 years ago
238de58e65
Change belongs_to_required_by_default to true ( #5888 )
7 years ago
d799921c75
Replace tutorial modal with welcome e-mail ( #6273 )
...
* Remove onboarding modal
* Welcome e-mail
* Send welcome e-mail after confirmation
* Remove obsolete translations
7 years ago
0c7dc6c781
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
7 years ago
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
dbda87c31f
Revert #5772 ( #6221 )
7 years ago
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
5ec25ff3e1
Fix email confirmation link not updating email ( #6187 )
...
A change introduced in #6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.
7 years ago
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
161c72d66d
Allow to dereference Follow object for ActivityPub ( #5772 )
...
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
7 years ago
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
04ecf44c2f
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
7 years ago
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
38fc1b498d
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
7 years ago
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
7 years ago
e35a350119
Examples for Status#set_locality and .as_tag_timeline.
...
This commit also:
- exposes the local-only emoji so that it can be used in examples
- allows local_only to be set explicitly, i.e. for timeline filtering
specs
7 years ago
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ad75ec8b5b
Add filters to admin UI for custom emojis ( #6003 )
7 years ago
20a6584d2d
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
7 years ago
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
14c4a33cd9
Change account_id non-nullable in lists ( #5979 )
7 years ago
481fac7c84
Exclude moved accounts from search results ( #5984 )
7 years ago
c5a4eda694
move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
288f1293ef
set local_only in a before_create callback instead of status service
7 years ago
0c46058a43
remove vestigial Status#local_only? definition
7 years ago
24f36ca912
Status#not_local_only scope should match nils too
7 years ago
6bd18e43ba
filter local-only statuses from public pages
7 years ago
08519cd4f4
status: stub local_only?, add scope, add marked_local_only?
7 years ago
434c70fd98
add a local_only column to the statuses table
7 years ago
6a82939adb
Fix account and tag searches with leading/trailing spaces ( #5965 )
...
* Strip leading & trailing spaces from account query
* Strip leading & trailing spaces from tag search
7 years ago
abe95b614b
add initial components based off of tootsuite pr #1507
7 years ago
2f4c5f504f
Limit users to 50 lists, remove pagination from lists API ( #5933 )
7 years ago
c36b9cc5a6
Ensure link thumbnails are not stretched to super low quality ( #5932 )
7 years ago
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
0c4ca3e549
Remove duplicate annotate ( #5910 )
...
* Remove duplicate annotate
* Remove blank line
7 years ago
c083816c24
Add embed_url to preview cards ( #5775 )
7 years ago
81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
7 years ago
David Yip
Eugen Rochko
Renato "Lond" Cerqueira
Alexander
Jenkins
Akihiko Odaki
Yamagishi Kazutoshi
Patrick Figel
Erin
Andrea Scarpino
cwm
beatrix