Commit Graph

287 Commits (1792b688ac6b0eeffa05076327cdf18bc97f5b48)

Author SHA1 Message Date
Eugen Rochko d017f240f9
Bump version to 2.4.2 6 years ago
Eugen Rochko 86cce466b6
Bump version to 2.4.2rc3 6 years ago
Eugen Rochko a04dca36a3
Bump version to 2.4.2rc2 6 years ago
Eugen Rochko 3b8023f9f9
Bump version to 2.4.2rc1 6 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 6 years ago
Eugen Rochko 0979d4275a
Bump version to 2.4.1 6 years ago
Eugen Rochko 35ae960122
Bump version to 2.4.1rc4 6 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.
6 years ago
Eugen Rochko 158cd7ee74
Bump version to 2.4.1rc3 6 years ago
Eugen Rochko fab65fb7e5
Bump version to 2.4.1rc2 6 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 6 years ago
Eugen Rochko a29f196f95
Bump version to 2.4.1rc1 6 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
Eugen Rochko 7745a22ec7
Bump version to 2.4.0 6 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.
6 years ago
Eugen Rochko 292c987522
Bump version to 2.4.0rc5 6 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/simple_form.ja.yml
6 years ago
Eugen Rochko bcbb6aa46f
Bump version to 2.4.0rc4 6 years ago
Jenkins 4c0770d6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 6 years ago
MIYAGI Hikaru 919eef3098 User agent for WebFinger (#7531)
* User agent for WebFinger

* local_domain → web_domain

* 'http' is away accidentally...
6 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge 6 years ago
Eugen Rochko 8756fd1e82
Bump version to 2.4.0rc3 6 years ago
Eugen Rochko d75b63e4fb
Bump version to 2.4.0rc2 6 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
6 years ago
Eugen Rochko 50ed1e83ac
Bump version to 2.4.0rc1 (#7283) 6 years ago
Thibaut Girka 88bcfaeb18 Point to glitch-soc source and not tootsuite on the public page
(hello AGPLv3)
6 years ago
Eugen Rochko 2a90da1837
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
6 years ago
Eugen Rochko 6cc432bbc4
Bump version to 2.3.2 6 years ago
Eugen Rochko dafae9818d
Bump version to 2.3.2rc5 6 years ago
Eugen Rochko f64af6473f
Bump version to 2.3.2rc4 6 years ago
Eugen Rochko 74c39fada0
Bump version to 2.3.2rc3 6 years ago
Eugen Rochko 092f1df9d0
Bump version to 2.3.2rc2 6 years ago
Eugen Rochko cdf8b92fea
Bump version to 2.3.2rc1 6 years ago
Eugen Rochko 2ef1ce1182
Bump version to 2.3.1 6 years ago
Eugen Rochko 79d3a8553f
Bump version to 2.3.1rc3 6 years ago
Eugen Rochko f89ff65ec7
Bump version to 2.3.1rc2 6 years ago
Eugen Rochko ab27dccba5
Bump version to 2.3.1rc1 6 years ago
Eugen Rochko 6e309f5e45
Bump version to 2.3.0 6 years ago
Eugen Rochko bd077ad7d9
Bump version to 2.3.0rc3 6 years ago
Eugen Rochko 4ca60c665e
Bump version to 2.3.0rc2 6 years ago
Eugen Rochko 64f2ada5d4
Bump version to 2.3.0rc1 6 years ago
Eugen Rochko e14c20582f
Bump version to 2.2.0 6 years ago
Eugen Rochko e6db3427b7
Bump to 2.2.0rc2 6 years ago
Eugen Rochko 0b7a0d15c7
Bump version to 2.2.0rc1 6 years ago
Eugen Rochko ff6ca8bdc6
Bump version to 2.1.3 6 years ago
Eugen Rochko e9822a4e4e
Bump version to 2.1.2 6 years ago
Eugen Rochko 7571c37c99
Bump version to 2.1.1 (#6164) 6 years ago
Daigo 3 Dango a434d9c0cc Remove period from the version number (#6039)
2.1.0. -> 2.1.0
7 years ago
Eugen Rochko a29432f0cd
Bump version to 2.1.0 🎆 7 years ago
Eugen Rochko 098c7d27fe
Bump version to 2.1.0rc6 7 years ago
Eugen Rochko 7cad926401
Bump version to 2.1.0rc5 7 years ago
Eugen Rochko 57fcc21a86
Bump version to 2.1.0rc4 7 years ago
Eugen Rochko 2526ef10c2
Bump version to 2.1.0rc3 7 years ago
Eugen Rochko 369f40bb9f
Bump version to 2.1.0rc2 7 years ago
Eugen Rochko f9a0d8f2b9
Bump version to 2.1.0rc1 (#5834) 7 years ago
Eugen Rochko 3810d98cd8 Bump version to 2.0.0 🐘 7 years ago
Eugen Rochko 637ea3bb5b Bump version to 2.0.0rc4 7 years ago
Eugen Rochko bc89995f65 Bump version to 2.0.0rc3 7 years ago
Eugen Rochko 7c33da45f0 Bump version to 2.0.0rc2 7 years ago
Eugen Rochko 0aa810f9c8 Bump version to 2.0.0rc1 (#5209) 7 years ago
Eugen Rochko efec507230 Bump to 1.6.1 7 years ago
Eugen Rochko ab71cf4593 Bump to 1.6.0 7 years ago
Eugen Rochko 4819e2913d Bump version to 1.6.0rc5 7 years ago
Eugen Rochko 2ff7146b6d Bump version to 1.6.0rc4 7 years ago
Eugen Rochko dd5cb5085c Bump version to 1.6.0rc2 7 years ago
Eugen Rochko 9dd8dff683 Bump version to 1.6.0rc1 (#4768) 7 years ago
Daigo 3 Dango 696c2c6f2f Add Mastodon::Source.url (#4643)
* Add Mastodon::Source.url

* Update spec

* Refactor

Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
Eugen Rochko 41c3389d76 Bump to 1.5.1 7 years ago
Eugen Rochko 559fd08845 Bump to 1.5.0 7 years ago
Eugen Rochko 9b247c3d88 Bump to 1.5.0rc3 7 years ago
Eugen Rochko fdb65dcbee Bump to 1.5.0rc2 7 years ago
Eugen Rochko a549d1ae6b Bump to 1.5.0rc1 (#4318) 7 years ago
Eugen Rochko b6a19e7b89 Bump version to 1.4.7 7 years ago
Eugen Rochko 7b13e6efc2 Bump version to 1.4.6 7 years ago
Eugen Rochko 1585b0c6cc Bump version to 1.4.4 7 years ago
Eugen Rochko 947887f261 Bump version to 1.4.3 7 years ago
Eugen Rochko 380b20eed6 Bump version to 1.4.2 7 years ago
Eugen Rochko 8963f8c3c2 Bump version to 1.4.1 7 years ago
Eugen Rochko 7b23f79d41 Bump version to 1.4.0.6 7 years ago
Eugen Rochko e0e12b0fee Bump version to 1.4.0.5 7 years ago
Eugen Rochko 2d97c898f2 Bump version to 1.4.0.4 7 years ago
Eugen Rochko b51398d0dd Bump version 7 years ago
Eugen Rochko 756db8103a Bump version to 1.4.0.2 (#3190) 7 years ago
Eugen Rochko 01e011bc90 Bump version to 1.3.2 (#2623) 7 years ago
Ash Furrow 5eef9dab80 Update version to 1.3.1 (#2571) 7 years ago
Eugen Rochko b48c9013aa Bump version, improve how version is stored for better commit history (#2526) 7 years ago
Ash Furrow a0ed88a99b Adds version to about/more and API (#2181)
* Adds version.

* Cleans up code.

* Removes standalone endpoint and adds version to instance endpoint.

* Addresses feedback from #2181.
7 years ago