glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	04204427d0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	6 years ago
Eugen Rochko	8d3910afdd	Improve e-mail MX validator and add tests (#9489 )	6 years ago
Thibaut Girka	bf26c23205	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	32c2f5a07f	Fix follow limit validator reporting lower number past threshold (#9230 ) * Fix follow limit validator reporting lower number past threshold * Avoid floating point follow limit	6 years ago
Thibaut Girka	f627ea99e4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	6 years ago
Eugen Rochko	48c2ab8cf5	Limit the number of people that can be followed from one account (#8807 ) Configurable soft limit of 7,500, and above that, configurable ratio of 1.1 * followers, controlled by: - MAX_FOLLOWS_THRESHOLD - MAX_FOLLOWS_RATIO Fix #2311	6 years ago
Thibaut Girka	3a4a87d9c0	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
abcang	258eba090b	Call address instead of exchange (#8076 )	6 years ago
Thibaut Girka	cf8121376b	Merge branch 'master' into glitch-soc/tentative-merge Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	6 years ago
Eugen Rochko	8bdc12d494	In e-mail validator, fallback from MX to A record (#7955 ) Fix #7831	6 years ago
Thibaut Girka	c822ecfa01	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
takayamaki	5a242be7ec	fix: Don't validate MX record in development (#7654 )	7 years ago
Thibaut Girka	3dc4f8e2ca	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	03c8890e09	Validate that e-mail resolves with MX and it's not blacklisted (#7631 ) Original patch by @j-a4	7 years ago
David Yip	c87f1d99e4	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
Emelia Smith	49d9ea6998	Implement the ability for instances to define a list of disallowed hashtags (#7176 ) The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.	7 years ago
Jenkins	a1894cbc13	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	a4732040f0	Allow more than the max pins if account is not local (#7105 ) Sidekiq sometimes throws errors for users that have more pinned items than the allowed by the local instance. It should only validate the number of pins for local accounts.	7 years ago
David Yip	2567d0a704	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Eugen Rochko	ebba6fb7f5	Fix UniqueUsernameValidator comparison (#6926 ) Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3	7 years ago
Jenkins	a9bcd383b8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	53b1100144	Permit dots in usernames with conditions (#6844 ) * Permit dots in usernames with conditions - Dot cannot be the start or end of username - a.lice and al.ice are considered the same during sign-up * Fix regex mixin flags	7 years ago
David Yip	4f8122a98c	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
abcang	225fdc2409	Validation of count works even when text of status is nil (#6429 )	7 years ago
David Yip	6d1023b2e9	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
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	7 years ago
David Yip	a56c9ac5dc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
Eugen Rochko	f16141ebac	Limit users to 50 lists, remove pagination from lists API (#5933 )	7 years ago
Lain Iwakura	a77e03ede4	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	7 years ago
Lain Iwakura	f517cbae22	Code style fixes.	7 years ago
Lain Iwakura	666540f4a8	Make character limit configurable.	7 years ago
utam0k	51f8cbfbeb	Implement EmailBlackList (#5109 ) * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Eugen Rochko	a47a5ab5cd	Fix #4918 - Limit pinned toots to 5 (#4923 )	7 years ago
Eugen Rochko	3e20cb7025	Pinned statuses (#4675 ) * Pinned statuses * yarn manage:translations	7 years ago
Eugen Rochko	14004daca4	Fix length validator counting things that look like URIs like URLs (#4462 ) URI.extract is too strong, not limited to URLs, matched real text. Same issue was present in language detector.	7 years ago
Eugen Rochko	39b0588256	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427 ) * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI	7 years ago
Gô Shoemake	2d31077bdf	Fix character/grapheme count stuff (#3839 ) * Bring Toot button in line with counter Both should use stringz I guess * Use grapheme_length for character count	8 years ago
Eugen Rochko	9ea895f05f	Correct validators so that existing error messages would look correct (#3668 )	8 years ago
Eugen Rochko	4a6ceb24c9	Added support for configurable reserved usernames (fix of #1382 ) (#3566 ) * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	8 years ago
Guillaume Lo Re	9e955fe688	Stricter whitelist rules (#2213 ) * Stricter whitelist rules * Linting * Added spec for blacklisting * Test subdomain blacklist on domain whitelist * No need to split * Change spec name	8 years ago
Eugen	87f7a3922c	Punycode URI normalization (#2370 ) * Fix #2119 - Whenever about to send a HTTP request, normalize the URI * Add test for IDN request in FetchLinkCardService * Perform IDN normalization on domains before they are stored in the DB	8 years ago
Matt Jankowski	49c3000d62	Organize coverage dirs (#1695 ) * Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config	8 years ago

42 Commits (ba8d23c7cb9a7836348b5b61ff650b61361cf121)