894e01163b
Bump version to 2.5.0rc2
6 years ago
69212ed0ad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
6 years ago
fc45d4a096
Bump version to 2.5.0rc1 ( #8356 )
6 years ago
1159490f00
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”.
6 years ago
13df3889f0
Redesign public profiles and toots ( #8068 )
6 years ago
ca97b0341b
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
54a78d1837
Bump version to 2.4.3
6 years ago
ea88974c04
Bump version to 2.4.3rc3
6 years ago
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
52fd091fe7
Bump version to 2.4.3rc2
6 years ago
47fd3f260c
Bump version to 2.4.3rc1
6 years ago
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
5db8a0ba36
Bump version to 2.4.2
6 years ago
d2a1e2e850
Bump version to 2.4.2rc3
6 years ago
8b2ab128a2
Bump version to 2.4.2rc2
6 years ago
5bcb18127c
Bump version to 2.4.2rc1
7 years ago
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
daf9bf9f12
Bump version to 2.4.1
7 years ago
e23ccfa059
Bump version to 2.4.1rc4
7 years ago
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
7 years ago
e28866b313
Bump version to 2.4.1rc3
7 years ago
36528f28a5
Bump version to 2.4.1rc2
7 years ago
a76f40890e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
eebe7fb2d5
Bump version to 2.4.1rc1
7 years ago
28ccf0a464
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
8205147d04
Bump version to 2.4.0
7 years ago
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
bbdce87b80
Bump version to 2.4.0rc5
7 years ago
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
7 years ago
604eae1677
Bump version to 2.4.0rc4
7 years ago
4a3872d26e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7dbf83d6b8
User agent for WebFinger ( #7531 )
...
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
7 years ago
efd2441d1f
Merge branch 'master' into glitch-soc/merge
7 years ago
dceab1af01
Bump version to 2.4.0rc3
7 years ago
759b2b9c99
Bump version to 2.4.0rc2
7 years ago
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
0dcb01855c
Bump version to 2.4.0rc1 ( #7283 )
7 years ago
f8c7031f23
Point to glitch-soc source and not tootsuite on the public page
...
(hello AGPLv3)
7 years ago
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
3939ca8a33
Bump version to 2.3.2
7 years ago
f4ef86a334
Bump version to 2.3.2rc5
7 years ago
8ccf42c149
Bump version to 2.3.2rc4
7 years ago
fd86b58568
Bump version to 2.3.2rc3
7 years ago
a9538ac293
Bump version to 2.3.2rc2
7 years ago
64d5c8a512
Bump version to 2.3.2rc1
7 years ago
61ad11683d
Bump version to 2.3.1
7 years ago
3bf841c74e
Bump version to 2.3.1rc3
7 years ago
9350e691cc
Bump version to 2.3.1rc2
7 years ago
b744cfee18
Bump version to 2.3.1rc1
7 years ago
f08bc1f188
Bump version to 2.3.0
7 years ago
38e93a9541
Bump version to 2.3.0rc3
7 years ago
5b2d4c84d9
Bump version to 2.3.0rc2
7 years ago
4bd1403368
Bump version to 2.3.0rc1
7 years ago
9d2cb4d12d
Bump version to 2.2.0
7 years ago
de667c2a95
Bump to 2.2.0rc2
7 years ago
b9794f1a49
Bump version to 2.2.0rc1
7 years ago
87dd894cf4
Bump version to 2.1.3
7 years ago
76268627c2
Bump version to 2.1.2
7 years ago
a0273c2c5e
Bump version to 2.1.1 ( #6164 )
7 years ago
64ae134e7b
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
7 years ago
b23c9ab7de
Bump version to 2.1.0 🎆
7 years ago
1079099d2b
Bump version to 2.1.0rc6
7 years ago
d4849787c5
Bump version to 2.1.0rc5
7 years ago
cae49f11c7
Bump version to 2.1.0rc4
7 years ago
a6fdeedb47
Bump version to 2.1.0rc3
7 years ago
3126869f5a
Bump version to 2.1.0rc2
7 years ago
11a9900269
Bump version to 2.1.0rc1 ( #5834 )
7 years ago
b222a9d5ee
Bump version to 2.0.0 🐘
7 years ago
cb48c98e02
Bump version to 2.0.0rc4
7 years ago
7603119d3a
Bump version to 2.0.0rc3
7 years ago
03457653e9
Bump version to 2.0.0rc2
7 years ago
2e9c614e77
Bump version to 2.0.0rc1 ( #5209 )
7 years ago
f3c22d480e
Bump to 1.6.1
7 years ago
6d13a61ea8
Bump to 1.6.0
7 years ago
0e213d4b1a
Bump version to 1.6.0rc5
7 years ago
fafd9d8bae
Bump version to 1.6.0rc4
7 years ago
3b88fcd18b
Bump version to 1.6.0rc2
7 years ago
c2cb70fe34
Bump version to 1.6.0rc1 ( #4768 )
7 years ago
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
1a8295b5ca
Bump to 1.5.1
7 years ago
ace8b7cb1a
Bump to 1.5.0
7 years ago
2c1fbae0b8
Bump to 1.5.0rc3
7 years ago
52f32d5592
Bump to 1.5.0rc2
7 years ago
6bfadd0390
Bump to 1.5.0rc1 ( #4318 )
7 years ago
b5c4671c76
Bump version to 1.4.7
7 years ago
81a2d672a7
Bump version to 1.4.6
7 years ago
bd6bee29de
Bump version to 1.4.4
8 years ago
1f042e5b43
Bump version to 1.4.3
8 years ago
cd5c9d67e8
Bump version to 1.4.2
8 years ago
abd41858a9
Bump version to 1.4.1
8 years ago
b3479fa629
Bump version to 1.4.0.6
8 years ago
ff78d90621
Bump version to 1.4.0.5
8 years ago
a41a509a93
Bump version to 1.4.0.4
8 years ago
664eef3527
Bump version
8 years ago
662d103f6e
Bump version to 1.4.0.2 ( #3190 )
8 years ago
f9efdccb97
Bump version to 1.3.2 ( #2623 )
8 years ago
f4093cdfe7
Update version to 1.3.1 ( #2571 )
8 years ago
e21b9c875e
Bump version, improve how version is stored for better commit history ( #2526 )
8 years ago
c229532144
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 .
8 years ago
Eugen Rochko
Thibaut Girka
Jenkins
David Yip
MIYAGI Hikaru
Daigo 3 Dango
Ash Furrow