160 Commits (ec49aa81753ac71fa26b2ee86448fa5b481d49e4)

Author	SHA1	Message	Date
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	5 years ago
ThibG	91eecd1b3c	Add border around 🕺 emoji (#14769) ... Fixes #14768	5 years ago
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	5 years ago
ThibG	f0b6ddd979	Add border around 🐞 emoji (#14712)	5 years ago
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	5 years ago
leo60228	e0f55f374c	Add emojis:generate_borders Rake task (#13773) ... * Add emojis:generate_borders Rake task * Address review * Border all dark emoji * Combine stroke with filter to reduce artifacting * Cleanup Camera with Flash * Add stroke-linejoin="round" The previous filter and tweaks were effectively a poor imitation of it. There are no artifacts for any dark emoji now! * Set stroke-width using property This fixes old versions of Firefox. * Store emoji in string instead of array * Use separate arguments for each path segment * Remove "background: black;"	5 years ago
ThibG	175fd5b8ba	Fix mastodon:setup choking on env variables containing '%' (#13940) ... Fix a regression introduced in #13928, caused by TTY::Command building shell commands by chaining string substitutions. Ditch TTY::Command and use system instead (both do shell out).	5 years ago
ThibG	9b7e3b4774	Fix mastodon:setup not running properly when some environment variables are set (#13928) ... When using one of the docker-compose containers, mastodon:setup will use the existing .env.production rather than the generated one during the setup steps. This is because dotenv does not overwrite env variables that are alreayd defined, and the docker-compose.yml file loads the environment variables from .env.production.	5 years ago
Thibaut Girka	63dc7cfa90	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
D Anzorge	29f5353f8b	Update Twemoji to 12.1.5 (#13021) ... * Update Twemoji to 12.1.5 SVGs from Twemoji repo https://github.com/twitter/twemoji * Update emoji_map.json to Unicode 12	5 years ago
Thibaut Girka	427ef4948a	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	ce17cea221	Fix installation failing when Redis password contains special characters (#13156) ... * Add support for special characters in Redis passwords Fixes #13154 * Refactor	5 years ago
Thibaut Girka	9adeaf2bfc	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system	5 years ago
Eugen Rochko	f52c988e12	Add announcements (#12662) ... * Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter	5 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	6 years ago
Yamagishi Kazutoshi	172eaeba3f	Add config of multipart threshold for S3 (#11924)	6 years ago
Thibaut Girka	74c5b2bd08	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	6 years ago
Eugen Rochko	9361981388	Add missing locale file for ga and add rake task to check for it (#11813) ... * Add missing locale file for ga and add rake task to check for it * Update lib/tasks/repo.rake Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh> * Fix check-i18n build	6 years ago
Thibaut Girka	9dfbcf941e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	9fd6443487	Add translators to AUTHORS.md (#9865)	6 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.	6 years ago
Eugen Rochko	7c3fddeab4	Change CHANGELOG.md references from pull requests to authors (#9864) ... Add `rake repo:changelog` to do that automatically	6 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	6 years ago
Eugen Rochko	2ee779dcd3	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
Thibaut Girka	c2b1e8bc43	Override current_user when generating static pages	6 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	186024a058	Add tootctl settings registrations open (#8829)	7 years ago
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	7 years ago
Eugen Rochko	6a3f9b7e53	Move more tasks to tootctl (#8675) ... * Move more tasks to tootctl - tootctl feeds build - tootctl feeds clear - tootctl accounts refresh Clean up exit codes and help messages * Move user modifying to tootctl * Improve user modification through CLI, rename commands add -> create mod -> modify del -> delete To remove ambiguity * Fix code style issues * Fix not being able to unset admin/mod role	7 years ago
Thibaut Girka	cd99255698	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.	7 years ago
rinsuki	25dd523887	using mailto scheme in AUTHORS.md (#8663)	7 years ago
nightpool	b0b484ba18	Add rake task for generating AUTHORS.md (#8661) ... * add rake task for generating AUTHORS.md * update AUTHORS.md * rubocop	7 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	7 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458) ... * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	7 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	b9c3788485	Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462) ... Remove old deprecated rake tasks	7 years ago
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	7 years ago
M Somerville	2bba6e582d	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) ... Still check for S3_CLOUDFRONT_HOST for existing installs.	7 years ago
Eugen Rochko	793eea2982	Add improved CLI interface for removing remote media (#8411) ... ./bin/tootctl media remove --days 7 --background Make the old rake task point to it	7 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	7 years ago
Eugen Rochko	d98de8ada7	Get rid of all batch order warnings (#8334)	7 years ago
ThibG	19da279703	Add some feedback to maintenance rake tasks (#8173)	7 years ago
ThibG	110b3f6335	Add some feedback to maintenance rake tasks (#8173)	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
Eugen Rochko	c7405fda11	Fix missing column in select in mastodon:feeds:build task (#7720)	7 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ad40bf5e0c	Speed up some rake tasks by moving execution to Sidekiq (#7678) ... * Speed up some rake tasks by moving execution to Sidekiq mastodon:media:remove_silenced mastodon:media:remove_remote mastodon:media:redownload_avatars mastodon:feeds:build * Fix code style issue	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
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301) ... * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	7 years ago
Alejandro Martinez Ruiz	06817b3c1f	tasks/mastodon: fix prompt for Redis password (#7241)	7 years ago