glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	6 years ago
ふぁぼ原	f7a6f9489d	Add a new preference to always hide all media (#8569 )	6 years ago
Matt Sweetman	1889526e23	Add user preference to always expand toots marked with content warnings (#8762 )	6 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	6 years ago
Eugen Rochko	c593d6df9c	Add preference for report notification e-mails, skip for duplicates (#8559 ) If an unresolved report for the same target account already exists, no new notification is generated	6 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	6 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458 ) * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	6 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	6 years ago
Eugen Rochko	2f34b747b3	Allow mods to disable login, improve message when login disabled (#8329 ) * Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests	6 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	59c68c1a74	Reduce user active duration from 7 days to 2 days (#8282 ) To minimize fanout work and redis home feed storage space when there are lots of recent sign-ups	6 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	6 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828 ) * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823 ) * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
Thibaut Girka	659b8a12ec	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes	7 years ago
Eugen Rochko	63c7b91572	Validate that e-mail resolves with MX and it's not blacklisted (#7631 ) Original patch by @j-a4	7 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532 ) * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	7 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445 ) - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	c73ce7b695	Store home feeds for 7 days instead of 14 (#7354 ) * Store home feeds for 7 days instead of 14 Reduces workload for status fan-out to active followers * Fix test for user model	7 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	7 years ago
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237 ) * 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	7 years ago
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Alexander	0306e3e9be	bugfixes and gem update (#6831 ) * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	c110fa62ac	Provide default OTP_SECRET value for development environment (#6617 )	7 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	47bdb9b33b	Fix #942 : Seamless LDAP login (#6556 )	7 years ago
Eugen Rochko	5cc716688a	Ensure the app does not even start if OTP_SECRET is not set (#6557 ) * Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them	7 years ago
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	7 years ago
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448 )	7 years ago
David Yip	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
Eugen Rochko	38e0133e1b	Make PAM gem optional, allow configuration over environment (#6415 )	7 years ago
Eugen Rochko	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
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Alexander	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
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	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
David Yip	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
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	7 years ago
Eugen Rochko	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
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252 )	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Patrick Figel	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
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago

1 2 3

127 Commits (ac9780b8449527a6a7ab5e2031eeb37f7f2291e7)