94 Commits (56f53231946fa760bf9a898d8b7bcfc58ee7f59f)

Author	SHA1	Message	Date
Thibaut Girka	ca97b0341b	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	54a78d1837	Bump version to 2.4.3	6 years ago
Eugen Rochko	ea88974c04	Bump version to 2.4.3rc3	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	52fd091fe7	Bump version to 2.4.3rc2	6 years ago
Eugen Rochko	47fd3f260c	Bump version to 2.4.3rc1	6 years ago
Thibaut Girka	8bd7b9b586	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	5db8a0ba36	Bump version to 2.4.2	6 years ago
Eugen Rochko	d2a1e2e850	Bump version to 2.4.2rc3	6 years ago
Eugen Rochko	8b2ab128a2	Bump version to 2.4.2rc2	6 years ago
Eugen Rochko	5bcb18127c	Bump version to 2.4.2rc1	7 years ago
Jenkins	695674b2fa	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	daf9bf9f12	Bump version to 2.4.1	7 years ago
Eugen Rochko	e23ccfa059	Bump version to 2.4.1rc4	7 years ago
David Yip	c2f7676dfc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 3114ac9655. It was resolved by accepting tootsuite's changes.	7 years ago
Eugen Rochko	e28866b313	Bump version to 2.4.1rc3	7 years ago
Eugen Rochko	36528f28a5	Bump version to 2.4.1rc2	7 years ago
Jenkins	a76f40890e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	eebe7fb2d5	Bump version to 2.4.1rc1	7 years ago
Thibaut Girka	28ccf0a464	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	8205147d04	Bump version to 2.4.0	7 years ago
Thibaut Girka	72c454e2b3	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.	7 years ago
Eugen Rochko	bbdce87b80	Bump version to 2.4.0rc5	7 years ago
Thibaut Girka	c384e0f3de	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	604eae1677	Bump version to 2.4.0rc4	7 years ago
Jenkins	4a3872d26e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
MIYAGI Hikaru	7dbf83d6b8	User agent for WebFinger (#7531) ... * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	7 years ago
Thibaut Girka	efd2441d1f	Merge branch 'master' into glitch-soc/merge	7 years ago
Eugen Rochko	dceab1af01	Bump version to 2.4.0rc3	7 years ago
Eugen Rochko	759b2b9c99	Bump version to 2.4.0rc2	7 years ago
Thibaut Girka	af504e62ff	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	0dcb01855c	Bump version to 2.4.0rc1 (#7283)	7 years ago
Thibaut Girka	f8c7031f23	Point to glitch-soc source and not tootsuite on the public page ... (hello AGPLv3)	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
Eugen Rochko	3939ca8a33	Bump version to 2.3.2	7 years ago
Eugen Rochko	f4ef86a334	Bump version to 2.3.2rc5	7 years ago
Eugen Rochko	8ccf42c149	Bump version to 2.3.2rc4	7 years ago
Eugen Rochko	fd86b58568	Bump version to 2.3.2rc3	7 years ago
Eugen Rochko	a9538ac293	Bump version to 2.3.2rc2	7 years ago
Eugen Rochko	64d5c8a512	Bump version to 2.3.2rc1	7 years ago
Eugen Rochko	61ad11683d	Bump version to 2.3.1	7 years ago
Eugen Rochko	3bf841c74e	Bump version to 2.3.1rc3	7 years ago
Eugen Rochko	9350e691cc	Bump version to 2.3.1rc2	7 years ago
Eugen Rochko	b744cfee18	Bump version to 2.3.1rc1	7 years ago
Eugen Rochko	f08bc1f188	Bump version to 2.3.0	7 years ago
Eugen Rochko	38e93a9541	Bump version to 2.3.0rc3	7 years ago
Eugen Rochko	5b2d4c84d9	Bump version to 2.3.0rc2	7 years ago
Eugen Rochko	4bd1403368	Bump version to 2.3.0rc1	7 years ago
Eugen Rochko	9d2cb4d12d	Bump version to 2.2.0	7 years ago
Eugen Rochko	de667c2a95	Bump to 2.2.0rc2	7 years ago