6c233a04a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
b65a9b7243
Bump version to 2.5.0
2018-09-02 22:32:27 +02:00
a74a7d5fe3
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-01 17:23:46 +02:00
08721170da
Bump version to 2.5.0rc2
2018-09-01 03:37:43 +02:00
246c313d45
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
23752639b2
Bump version to 2.5.0rc1 ( #8356 )
2018-08-23 23:30:57 +02:00
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”.
2018-08-01 00:18:13 +02:00
bb71538bb5
Redesign public profiles and toots ( #8068 )
2018-07-28 19:25:33 +02:00
6f0f583abe
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-11 17:57:08 +02:00
7ac5151b74
Bump version to 2.4.3
2018-07-11 11:21:27 +02:00
89dc0c98ee
Bump version to 2.4.3rc3
2018-07-11 01:31:23 +02:00
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.
2018-07-09 07:13:59 +02:00
451e585b97
Bump version to 2.4.3rc2
2018-07-07 22:23:52 +02:00
cb36ab9a10
Bump version to 2.4.3rc1
2018-07-05 21:08:03 +02:00
ab5f450700
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
d017f240f9
Bump version to 2.4.2
2018-06-19 01:45:00 +02:00
86cce466b6
Bump version to 2.4.2rc3
2018-06-19 00:19:54 +02:00
a04dca36a3
Bump version to 2.4.2rc2
2018-06-18 23:01:52 +02:00
3b8023f9f9
Bump version to 2.4.2rc1
2018-06-15 20:38:41 +02:00
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
0979d4275a
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
35ae960122
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
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
2018-06-07 05:13:49 -05:00
158cd7ee74
Bump version to 2.4.1rc3
2018-06-06 21:27:06 +02:00
fab65fb7e5
Bump version to 2.4.1rc2
2018-06-05 11:53:30 +00:00
165b5dc7f5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
a29f196f95
Bump version to 2.4.1rc1
2018-05-30 19:16:41 +02:00
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
7745a22ec7
Bump version to 2.4.0
2018-05-22 19:39:35 +02:00
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.
2018-05-21 16:40:02 +02:00
292c987522
Bump version to 2.4.0rc5
2018-05-21 16:05:31 +02:00
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
bcbb6aa46f
Bump version to 2.4.0rc4
2018-05-19 18:38:10 +02:00
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-18 00:17:23 +00:00
919eef3098
User agent for WebFinger ( #7531 )
...
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
2018-05-18 01:47:22 +02:00
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
8756fd1e82
Bump version to 2.4.0rc3
2018-05-14 17:46:44 +02:00
d75b63e4fb
Bump version to 2.4.0rc2
2018-05-14 14:49:38 +02:00
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
50ed1e83ac
Bump version to 2.4.0rc1 ( #7283 )
2018-05-06 11:50:00 +02:00
88bcfaeb18
Point to glitch-soc source and not tootsuite on the public page
...
(hello AGPLv3)
2018-04-08 15:43:26 +02:00
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
2018-03-27 04:33:57 +02:00
6cc432bbc4
Bump version to 2.3.2
2018-03-22 14:13:46 +01:00
dafae9818d
Bump version to 2.3.2rc5
2018-03-22 11:31:52 +01:00
f64af6473f
Bump version to 2.3.2rc4
2018-03-20 23:49:24 +01:00
74c39fada0
Bump version to 2.3.2rc3
2018-03-19 12:20:57 +01:00
092f1df9d0
Bump version to 2.3.2rc2
2018-03-17 15:28:52 +01:00
cdf8b92fea
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
2ef1ce1182
Bump version to 2.3.1
2018-03-13 15:50:15 +01:00
79d3a8553f
Bump version to 2.3.1rc3
2018-03-13 09:21:21 +01:00
f89ff65ec7
Bump version to 2.3.1rc2
2018-03-12 12:48:49 +01:00
ab27dccba5
Bump version to 2.3.1rc1
2018-03-11 15:13:13 +01:00
6e309f5e45
Bump version to 2.3.0
2018-03-09 12:59:58 +01:00
bd077ad7d9
Bump version to 2.3.0rc3
2018-03-08 11:19:02 +01:00
4ca60c665e
Bump version to 2.3.0rc2
2018-03-07 12:06:23 +01:00
64f2ada5d4
Bump version to 2.3.0rc1
2018-03-01 20:50:23 +01:00
e14c20582f
Bump version to 2.2.0
2018-01-29 01:12:36 +01:00
e6db3427b7
Bump to 2.2.0rc2
2018-01-24 04:16:30 +01:00
0b7a0d15c7
Bump version to 2.2.0rc1
2018-01-20 16:27:19 +01:00
ff6ca8bdc6
Bump version to 2.1.3
2018-01-08 19:15:31 +01:00
e9822a4e4e
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
7571c37c99
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
a434d9c0cc
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
a29432f0cd
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
098c7d27fe
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
7cad926401
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
57fcc21a86
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
2526ef10c2
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
f9a0d8f2b9
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
3810d98cd8
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
637ea3bb5b
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
bc89995f65
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
7c33da45f0
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
0aa810f9c8
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
efec507230
Bump to 1.6.1
2017-09-16 03:08:29 +02:00
ab71cf4593
Bump to 1.6.0
2017-09-10 15:10:03 +02:00
4819e2913d
Bump version to 1.6.0rc5
2017-09-10 10:26:51 +02:00
2ff7146b6d
Bump version to 1.6.0rc4
2017-09-09 14:53:49 +02:00
dd5cb5085c
Bump version to 1.6.0rc2
2017-09-06 19:02:03 +02:00
9dd8dff683
Bump version to 1.6.0rc1 ( #4768 )
2017-09-03 01:12:05 +02:00
696c2c6f2f
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
2017-08-22 22:54:19 +02:00
41c3389d76
Bump to 1.5.1
2017-08-06 23:53:25 +02:00
559fd08845
Bump to 1.5.0
2017-08-01 15:12:07 +02:00
9b247c3d88
Bump to 1.5.0rc3
2017-07-31 15:28:36 +02:00
fdb65dcbee
Bump to 1.5.0rc2
2017-07-28 17:22:41 +02:00
a549d1ae6b
Bump to 1.5.0rc1 ( #4318 )
2017-07-24 16:21:08 +02:00
b6a19e7b89
Bump version to 1.4.7
2017-06-28 17:44:17 +02:00
7b13e6efc2
Bump version to 1.4.6
2017-06-23 17:02:14 +02:00
1585b0c6cc
Bump version to 1.4.4
2017-06-20 21:32:37 +02:00
947887f261
Bump version to 1.4.3
2017-06-15 03:03:42 +02:00
380b20eed6
Bump version to 1.4.2
2017-06-08 15:30:43 +02:00
8963f8c3c2
Bump version to 1.4.1
2017-05-28 19:30:38 +02:00
7b23f79d41
Bump version to 1.4.0.6
2017-05-28 16:32:53 +02:00
e0e12b0fee
Bump version to 1.4.0.5
2017-05-27 16:56:47 +02:00
2d97c898f2
Bump version to 1.4.0.4
2017-05-26 14:16:04 +02:00
b51398d0dd
Bump version
2017-05-22 21:38:19 +02:00
756db8103a
Bump version to 1.4.0.2 ( #3190 )
2017-05-20 23:30:20 +02:00
01e011bc90
Bump version to 1.3.2 ( #2623 )
2017-04-29 19:26:32 +02:00
5eef9dab80
Update version to 1.3.1 ( #2571 )
2017-04-28 09:07:48 -04:00
b48c9013aa
Bump version, improve how version is stored for better commit history ( #2526 )
2017-04-27 15:22:19 +02:00
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 .
2017-04-21 03:30:59 +02:00
Thibaut Girka