246c313d45
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
23752639b2
Bump version to 2.5.0rc1 ( #8356 )
6 years ago
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”.
6 years ago
bb71538bb5
Redesign public profiles and toots ( #8068 )
6 years ago
6f0f583abe
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7ac5151b74
Bump version to 2.4.3
6 years ago
89dc0c98ee
Bump version to 2.4.3rc3
6 years ago
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.
6 years ago
451e585b97
Bump version to 2.4.3rc2
6 years ago
cb36ab9a10
Bump version to 2.4.3rc1
6 years ago
ab5f450700
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
d017f240f9
Bump version to 2.4.2
7 years ago
86cce466b6
Bump version to 2.4.2rc3
7 years ago
a04dca36a3
Bump version to 2.4.2rc2
7 years ago
3b8023f9f9
Bump version to 2.4.2rc1
7 years ago
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
0979d4275a
Bump version to 2.4.1
7 years ago
35ae960122
Bump version to 2.4.1rc4
7 years ago
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
7 years ago
158cd7ee74
Bump version to 2.4.1rc3
7 years ago
fab65fb7e5
Bump version to 2.4.1rc2
7 years ago
165b5dc7f5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
a29f196f95
Bump version to 2.4.1rc1
7 years ago
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
7745a22ec7
Bump version to 2.4.0
7 years ago
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.
7 years ago
292c987522
Bump version to 2.4.0rc5
7 years ago
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
7 years ago
bcbb6aa46f
Bump version to 2.4.0rc4
7 years ago
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
919eef3098
User agent for WebFinger ( #7531 )
...
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
7 years ago
ba7ee67498
Merge branch 'master' into glitch-soc/merge
7 years ago
8756fd1e82
Bump version to 2.4.0rc3
7 years ago
d75b63e4fb
Bump version to 2.4.0rc2
7 years ago
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
50ed1e83ac
Bump version to 2.4.0rc1 ( #7283 )
7 years ago
88bcfaeb18
Point to glitch-soc source and not tootsuite on the public page
...
(hello AGPLv3)
7 years ago
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
7 years ago
6cc432bbc4
Bump version to 2.3.2
7 years ago
dafae9818d
Bump version to 2.3.2rc5
7 years ago
f64af6473f
Bump version to 2.3.2rc4
7 years ago
74c39fada0
Bump version to 2.3.2rc3
7 years ago
092f1df9d0
Bump version to 2.3.2rc2
7 years ago
cdf8b92fea
Bump version to 2.3.2rc1
7 years ago
2ef1ce1182
Bump version to 2.3.1
7 years ago
79d3a8553f
Bump version to 2.3.1rc3
7 years ago
f89ff65ec7
Bump version to 2.3.1rc2
7 years ago
ab27dccba5
Bump version to 2.3.1rc1
7 years ago
6e309f5e45
Bump version to 2.3.0
7 years ago
bd077ad7d9
Bump version to 2.3.0rc3
7 years ago
4ca60c665e
Bump version to 2.3.0rc2
7 years ago
64f2ada5d4
Bump version to 2.3.0rc1
7 years ago
e14c20582f
Bump version to 2.2.0
7 years ago
e6db3427b7
Bump to 2.2.0rc2
7 years ago
0b7a0d15c7
Bump version to 2.2.0rc1
7 years ago
ff6ca8bdc6
Bump version to 2.1.3
7 years ago
e9822a4e4e
Bump version to 2.1.2
7 years ago
7571c37c99
Bump version to 2.1.1 ( #6164 )
7 years ago
a434d9c0cc
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
7 years ago
a29432f0cd
Bump version to 2.1.0 🎆
7 years ago
098c7d27fe
Bump version to 2.1.0rc6
7 years ago
7cad926401
Bump version to 2.1.0rc5
7 years ago
57fcc21a86
Bump version to 2.1.0rc4
7 years ago
2526ef10c2
Bump version to 2.1.0rc3
7 years ago
369f40bb9f
Bump version to 2.1.0rc2
7 years ago
f9a0d8f2b9
Bump version to 2.1.0rc1 ( #5834 )
7 years ago
3810d98cd8
Bump version to 2.0.0 🐘
7 years ago
637ea3bb5b
Bump version to 2.0.0rc4
7 years ago
bc89995f65
Bump version to 2.0.0rc3
7 years ago
7c33da45f0
Bump version to 2.0.0rc2
7 years ago
0aa810f9c8
Bump version to 2.0.0rc1 ( #5209 )
7 years ago
efec507230
Bump to 1.6.1
7 years ago
ab71cf4593
Bump to 1.6.0
7 years ago
4819e2913d
Bump version to 1.6.0rc5
7 years ago
2ff7146b6d
Bump version to 1.6.0rc4
7 years ago
dd5cb5085c
Bump version to 1.6.0rc2
7 years ago
9dd8dff683
Bump version to 1.6.0rc1 ( #4768 )
7 years ago
696c2c6f2f
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
41c3389d76
Bump to 1.5.1
7 years ago
559fd08845
Bump to 1.5.0
7 years ago
9b247c3d88
Bump to 1.5.0rc3
7 years ago
fdb65dcbee
Bump to 1.5.0rc2
7 years ago
a549d1ae6b
Bump to 1.5.0rc1 ( #4318 )
7 years ago
b6a19e7b89
Bump version to 1.4.7
7 years ago
7b13e6efc2
Bump version to 1.4.6
8 years ago
1585b0c6cc
Bump version to 1.4.4
8 years ago
947887f261
Bump version to 1.4.3
8 years ago
380b20eed6
Bump version to 1.4.2
8 years ago
8963f8c3c2
Bump version to 1.4.1
8 years ago
7b23f79d41
Bump version to 1.4.0.6
8 years ago
e0e12b0fee
Bump version to 1.4.0.5
8 years ago
2d97c898f2
Bump version to 1.4.0.4
8 years ago
b51398d0dd
Bump version
8 years ago
756db8103a
Bump version to 1.4.0.2 ( #3190 )
8 years ago
01e011bc90
Bump version to 1.3.2 ( #2623 )
8 years ago
5eef9dab80
Update version to 1.3.1 ( #2571 )
8 years ago
b48c9013aa
Bump version, improve how version is stored for better commit history ( #2526 )
8 years ago
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 .
8 years ago
Thibaut Girka
Eugen Rochko
Jenkins
David Yip
MIYAGI Hikaru
Daigo 3 Dango
Ash Furrow