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
Thibaut Girka