73 Commits (bde7a415b9ecbe9bcdf5d32918fd2cfcf5dad0d7)

Author	SHA1	Message	Date
Thibaut Girka	08a2af27c3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	ae18386558	Fix “invited by” not showing up for invited accounts in admin interface (#10791)	7 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	7 years ago
Eugen Rochko	7cb369d4c6	Change e-mail whitelist/blacklist to not be checked when invited (#10683) ... * Change e-mail whitelist/blacklist to not be checked when invited And only when creating an account, not when updating it later Fix #10648 * Fix test	7 years ago
Zac	be6ef1947e	changed pinned status count operator ... changed default pinned count to 5 to preserve default behavior	7 years ago
Zac	5616200ed4	added documentation into .env.production.sample ... moved max pin count into constant	7 years ago
Zac	a36affb9d6	add env var for max pinned toots	7 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	7 years ago
Eugen Rochko	400397c0c7	Change HTML validator to ignore all errors except unmatched tags (#10534)	7 years ago
Hinaloe	48f466daf1	Allow set the voting period to just 5 minutes (#10525) ... * Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize	7 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	7 years ago
Eugen Rochko	2c63e0292a	Fix admin validation being too strict about usernames (#10449) ... * Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase	7 years ago
Thibaut Girka	fae53e1a39	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	0c46bd11aa	Fix HTML validation (#10354) ... * Fix HTML validation * Report first HTML error instead on validation error	7 years ago
Thibaut Girka	fcce135d27	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.	7 years ago
Eugen Rochko	555c4e11ba	Add validations to admin settings (#10348) ... * Add validations to admin settings - Validate correct HTML markup - Validate presence of contact username & e-mail - Validate that all usernames are valid - Validate that enums have expected values * Fix code style issue * Fix tests	7 years ago
Thibaut Girka	4806232997	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	5996be994d	Fix poll validation issues (#10186) ... - Fix missing interpolation argument in PollValidator - Fix PollValidator rejecting exact allowed min/max durations	7 years ago
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	7 years ago
ThibG	f2a1b8b96b	Widen allowed time windows for polls (#10162)	7 years ago
Eugen Rochko	8fe93b0701	Fix vote validation for polls with multiple choices (#10138)	7 years ago
Eugen Rochko	230a012f00	Add polls (#10111) ... * Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media	7 years ago
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Franck Zoccolo	4f0322dcae	Add support for IPv6 only MXes in Email validation (#10009) ... * Add support for IPv6 only MXes * Fixed email validator tests	7 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	7 years ago
Eugen Rochko	45899cfa69	Change note length validation to ignore mention domains and URLs (#9717) ... Fix #4419	7 years ago
ysksn	19abf4ef0b	Add specs for UnreservedUsernameValidator (#9698) ... * Add specs for UnreservedUsernameValidator * Use instance variable	7 years ago
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	7 years ago
ysksn	05edec6917	Add specs for BlackListedEmailValidator (#9651) ... * Add specs for BlackListedEmailValidator * Use instance variable	7 years ago
ysksn	4725aeec9f	Add specs for DisallowedHashtagsValidator (#9653) ... In order to implement tests easier, `#select_tags` created.	7 years ago
ysksn	ccb9c1b952	Add pending specs for StatusLengthValidator (#9647) ... * Add pending specs of StatusLengthValidator * Use instance variable	7 years ago
Thibaut Girka	65e994b29b	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.	7 years ago
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489)	7 years ago
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	7f4adfaf77	Fix follow limit validator reporting lower number past threshold (#9230) ... * Fix follow limit validator reporting lower number past threshold * Avoid floating point follow limit	7 years ago
Thibaut Girka	00fcdebed7	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.	7 years ago
Eugen Rochko	a46ab86adf	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	7 years ago
Thibaut Girka	6141c2a035	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
abcang	9ad334f65c	Call address instead of exchange (#8076)	8 years ago
Thibaut Girka	d392020da6	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.	8 years ago
Eugen Rochko	32a4b524fb	In e-mail validator, fallback from MX to A record (#7955) ... Fix #7831	8 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
takayamaki	03f4c214b4	fix: Don't validate MX record in development (#7654)	8 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	8 years ago
Eugen Rochko	63c7b91572	Validate that e-mail resolves with MX and it's not blacklisted (#7631) ... Original patch by @j-a4	8 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	8 years ago
Emelia Smith	60b871d56c	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.	8 years ago
Jenkins	e3d0d72b29	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Renato "Lond" Cerqueira	14d86eb0d0	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.	8 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago