287 Commits (3c49daeb8d93010dc072de82e06a016bac7dbf16)

Author	SHA1	Message	Date
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	8 years ago
Eugen Rochko	d98de8ada7	Get rid of all batch order warnings (#8334)	8 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	8 years ago
Immae	b0f4fe456b	Add ldap search filter (#8151)	8 years ago
Eugen Rochko	fcb527cdd6	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	8 years ago
ThibG	19da279703	Add some feedback to maintenance rake tasks (#8173)	8 years ago
Eugen Rochko	018a9e4e7f	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	8 years ago
ThibG	110b3f6335	Add some feedback to maintenance rake tasks (#8173)	8 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	8 years ago
Thibaut Girka	5f1bdca4c8	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.	8 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	8 years ago
Eugen Rochko	0fb0037ca7	Resize images by area instead of fixed dimensions (#8083) ... To improve the way super tall or super ride images are treated, the numbers remain the same, 1280x1280 and 400x400, but if an image is less in one dimension than the other, the other can become larger Thanks to @WAHa_06x36@mastodon.social for the tip	8 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	8 years ago
Eugen Rochko	5a6645c922	Fix static GIFs being saved as empty files when using local storage (#8012) ... Fix #7997 Fix #6237	8 years ago
Thibaut Girka	6f0f583abe	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	7ac5151b74	Bump version to 2.4.3	8 years ago
Eugen Rochko	89dc0c98ee	Bump version to 2.4.3rc3	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	451e585b97	Bump version to 2.4.3rc2	8 years ago
Eugen Rochko	cb36ab9a10	Bump version to 2.4.3rc1	8 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	8 years ago
Eugen Rochko	d017f240f9	Bump version to 2.4.2	8 years ago
Eugen Rochko	86cce466b6	Bump version to 2.4.2rc3	8 years ago
Eugen Rochko	a04dca36a3	Bump version to 2.4.2rc2	8 years ago
Eugen Rochko	3b8023f9f9	Bump version to 2.4.2rc1	8 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	0979d4275a	Bump version to 2.4.1	8 years ago
Eugen Rochko	35ae960122	Bump version to 2.4.1rc4	8 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.	8 years ago
Eugen Rochko	158cd7ee74	Bump version to 2.4.1rc3	8 years ago
Eugen Rochko	fab65fb7e5	Bump version to 2.4.1rc2	8 years ago
Eugen Rochko	c7405fda11	Fix missing column in select in mastodon:feeds:build task (#7720)	8 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 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	8 years ago
Eugen Rochko	a29f196f95	Bump version to 2.4.1rc1	8 years ago
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	7745a22ec7	Bump version to 2.4.0	8 years ago
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	8 years ago
Eugen Rochko	292c987522	Bump version to 2.4.0rc5	8 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	8 years ago
Eugen Rochko	bcbb6aa46f	Bump version to 2.4.0rc4	8 years ago
Jenkins	4c0770d6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
MIYAGI Hikaru	919eef3098	User agent for WebFinger (#7531) ... * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Eugen Rochko	8756fd1e82	Bump version to 2.4.0rc3	8 years ago
Eugen Rochko	d75b63e4fb	Bump version to 2.4.0rc2	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
Eugen Rochko	50ed1e83ac	Bump version to 2.4.0rc1 (#7283)	8 years ago
David Yip	da70208b45	Merge remote-tracking branch 'origin/master' into merge-upstream	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