me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5710 commits 2 branches 0 tags 429 MiB
Commit graph

635 commits

Author SHA1 Message Date
David Yip
6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
      app/javascript/styles/mastodon/components.scss
 2018-02-02 08:39:52 -06:00
Alexander
23ce0c86da 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
 2018-02-02 10:18:55 +01:00
Jenkins
3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
Eugen Rochko
f378280e49 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.
 2018-01-23 20:52:30 +01:00
Akihiko Odaki
b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
 2018-01-22 14:25:09 +01:00
David Yip
d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
 2018-01-19 15:22:10 -06:00
Yamagishi Kazutoshi
49b76b3025 Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
Eugen Rochko
b0f2bff481 Replace tutorial modal with welcome e-mail (#6273) 
* Remove onboarding modal

* Welcome e-mail

* Send welcome e-mail after confirmation

* Remove obsolete translations
 2018-01-18 19:17:25 +01:00
Jenkins
6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-15 06:17:15 +00:00
Eugen Rochko
67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 2018-01-15 04:34:28 +01:00
Jenkins
1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 10:17:15 +00:00
Eugen Rochko
c8f0be1d6d Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
Jenkins
796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
Patrick Figel
bc5487a1c2 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.
 2018-01-05 00:15:35 +01:00
Jenkins
a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 20:17:13 +00:00
Akihiko Odaki
7a0479c830 Allow to dereference Follow object for ActivityPub (#5772) 
* Allow to dereference Follow object for ActivityPub

* Accept IRI as object representation for Accept activity
 2018-01-03 18:08:57 +01:00
Jenkins
b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 04:17:11 +00:00
Patrick Figel
3c20cfd734 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
 2018-01-02 16:55:00 +01:00
David Yip
01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/auth/confirmations_controller.rb
 2017-12-30 17:20:07 -06:00
Eugen Rochko
9427823d5c 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
 2017-12-29 19:52:04 +01:00
David Yip
d53f727653 Merge branch 'gs-master' into prevent-local-only-federation 
Conflicts:
	db/schema.rb
 2017-12-15 12:20:56 -06:00
David Yip
b8e6074c53 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
 2017-12-14 02:27:42 -06:00
Jenkins
1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
Eugen Rochko
d6088c5308 Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
Eugen Rochko
aea3d0814b 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
 2017-12-13 12:15:10 +01:00
David Yip
a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
Akihiko Odaki
a90fa13235 Change account_id non-nullable in lists (#5979) 2017-12-12 04:11:17 +01:00
Eugen Rochko
3b69e9b99c Exclude moved accounts from search results (#5984) 2017-12-12 02:14:33 +01:00
Erin
eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru) 2017-12-11 15:28:04 -06:00
Erin
6f3321fe4f set local_only in a before_create callback instead of status service 2017-12-10 21:39:27 -06:00
Erin
7fc6f40a88 remove vestigial Status#local_only? definition 2017-12-10 21:25:36 -06:00
Erin
278d34a0ec Status#not_local_only scope should match nils too 2017-12-10 20:35:42 -06:00
Erin
b463321c6f filter local-only statuses from public pages 2017-12-10 17:23:01 -06:00
Erin
993449ee59 status: stub local_only?, add scope, add marked_local_only? 2017-12-10 17:04:28 -06:00
Erin
5eadff9883 add a local_only column to the statuses table 2017-12-10 16:41:25 -06:00
Andrea Scarpino
e8198cd298 Fix account and tag searches with leading/trailing spaces (#5965) 
* Strip leading & trailing spaces from account query

* Strip leading & trailing spaces from tag search
 2017-12-10 19:35:46 +01:00
cwm
41bbfeec7c add initial components based off of tootsuite pr #1507 2017-12-09 10:26:22 -06:00
Eugen Rochko
f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933) 2017-12-09 01:32:29 +01:00
Eugen Rochko
46cce9ee4b Ensure link thumbnails are not stretched to super low quality (#5932) 2017-12-09 00:56:16 +01:00
Jenkins
099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-07 04:17:14 +00:00
Yamagishi Kazutoshi
a7f20ed185 Remove duplicate annotate (#5910) 
* Remove duplicate annotate

* Remove blank line
 2017-12-07 04:53:42 +01:00
Akihiko Odaki
ce3989fc6a Add embed_url to preview cards (#5775) 2017-12-07 03:37:43 +01:00
beatrix
f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme 
Advanced Next-Level Flavours And Skins For Mastodon™
 2017-12-06 17:44:07 -05:00
Jenkins
a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
Yamagishi Kazutoshi
fba46b6072 Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
Eugen Rochko
b037fbf9f4 Remove rabl dependency (#5894) 
* Remove rabl dependency

* Replicate old Oj configuration
 2017-12-06 15:04:49 +09:00
Eugen Rochko
ff4c28a305 Lists redis clean-up (#5886) 
* When list is deleted, remove feed from redis

* Clean up list feeds of inactive users
 2017-12-05 23:20:27 +01:00
Eugen Rochko
1e7f022fa2 Add list of lists component to web UI (#5811) 
* Add list of lists component to web UI

* Add list adding

* Add list removing

* List editor modal

* Add API account search limited by following=true relation

* Rework list editor modal

* Remove mandatory pagination of GET /api/v1/lists/:id/accounts

* Adjust search input placeholder

* Fix rspec (#5890)

* i18n: (zh-CN) Add missing translations for #5811 (#5891)

* i18n: (zh-CN) yarn manage:translations -- zh-CN

* i18n: (zh-CN) Add missing translations for #5811

* Fix some issues

- Display loading/missing state for list timelines
- Order lists alphabetically in overview
- Fix async list editor reset
- Redirect to /lists after deleting unpinned list
- Redirect to / after pinning a list

* Remove dead list columns when a list is deleted or fetch returns 404
 2017-12-05 23:02:27 +01:00
David Yip
1221e3075d Merge branch 'gs-master' into glitch-theme 2017-12-04 11:07:01 -06:00
kibigo!
882055afd0 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00