Eugen Rochko
ab3f2aba04
Bump version to 2.6.3 ( #9391 )
2018-11-30 14:20:15 +01:00
Thibaut Girka
35b6fb4e62
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 15:10:58 +01:00
Eugen Rochko
163c5e6893
Bump version to 2.6.2 ( #9370 )
2018-11-27 13:56:47 +01:00
Thibaut Girka
33ad16faa7
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-31 10:08:36 +01:00
Eugen Rochko
56e256b686
Bump version to 2.6.1 ( #9172 )
2018-10-31 01:04:45 +01:00
Eugen Rochko
15fd0fb2cf
Bump version to 2.6.0 ( #9149 )
...
* Bump version to 2.6.0
* Update CHANGELOG.md
2018-10-30 22:06:59 +01:00
Thibaut Girka
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
Eugen Rochko
4c8ac98fa0
Bump version to 2.6.0rc4 ( #9164 )
...
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
2018-10-30 17:37:49 +01:00
Thibaut Girka
915a202260
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:16:35 +01:00
Eugen Rochko
e6c91483fb
Bump version to 2.6.0rc3 ( #9142 )
...
* Bump version to 2.6.0rc3
* Update CHANGELOG.md
2018-10-29 14:15:54 +01:00
Thibaut Girka
c32a5f86b6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
Eugen Rochko
9035c156c2
Bump version to 2.6.0rc2 ( #9087 )
...
* Bump version to 2.6.0rc2
* Update CHANGELOG.md
2018-10-25 04:42:25 +02:00
Thibaut Girka
46259a36d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
Eugen Rochko
bb62322411
Bump version to 2.6.0rc1 ( #9025 )
...
* Bump version to 2.6.0rc1
* Update AUTHORS.md
* Update CHANGELOG.md
2018-10-21 00:49:36 +02:00
Eugen Rochko
6cd4eaaee7
Bump version to 2.5.2 ( #8960 )
2018-10-12 00:24:09 +02:00
Eugen Rochko
a441df3e19
Bump version to 2.5.1 ( #8953 )
2018-10-11 02:29:32 +02:00
Thibaut Girka
855a69c2cd
Add -glitch suffix to version string
...
Fixes #715
2018-09-26 11:11:30 +02:00
Thibaut Girka
7134c1f522
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
Eugen Rochko
e3fdf02943
Bump version to 2.5.0
2018-09-02 22:32:27 +02:00
Thibaut Girka
65e4345a48
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-01 17:23:46 +02:00
Eugen Rochko
894e01163b
Bump version to 2.5.0rc2
2018-09-01 03:37:43 +02:00
Thibaut Girka
69212ed0ad
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
Eugen Rochko
fc45d4a096
Bump version to 2.5.0rc1 ( #8356 )
2018-08-23 23:30:57 +02:00
Thibaut Girka
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”.
2018-08-01 00:18:13 +02:00
Eugen Rochko
13df3889f0
Redesign public profiles and toots ( #8068 )
2018-07-28 19:25:33 +02:00
Thibaut Girka
ca97b0341b
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-11 17:57:08 +02:00
Eugen Rochko
54a78d1837
Bump version to 2.4.3
2018-07-11 11:21:27 +02:00
Eugen Rochko
ea88974c04
Bump version to 2.4.3rc3
2018-07-11 01:31:23 +02:00
Thibaut Girka
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.
2018-07-09 07:13:59 +02:00
Eugen Rochko
52fd091fe7
Bump version to 2.4.3rc2
2018-07-07 22:23:52 +02:00
Eugen Rochko
47fd3f260c
Bump version to 2.4.3rc1
2018-07-05 21:08:03 +02:00
Thibaut Girka
8bd7b9b586
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
Eugen Rochko
5db8a0ba36
Bump version to 2.4.2
2018-06-19 01:45:00 +02:00
Eugen Rochko
d2a1e2e850
Bump version to 2.4.2rc3
2018-06-19 00:19:54 +02:00
Eugen Rochko
8b2ab128a2
Bump version to 2.4.2rc2
2018-06-18 23:01:52 +02:00
Eugen Rochko
5bcb18127c
Bump version to 2.4.2rc1
2018-06-15 20:38:41 +02:00
Jenkins
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
Eugen Rochko
daf9bf9f12
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
Eugen Rochko
e23ccfa059
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
David Yip
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
.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
Eugen Rochko
e28866b313
Bump version to 2.4.1rc3
2018-06-06 21:27:06 +02:00
Eugen Rochko
36528f28a5
Bump version to 2.4.1rc2
2018-06-05 11:53:30 +00:00
Jenkins
a76f40890e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
Eugen Rochko
eebe7fb2d5
Bump version to 2.4.1rc1
2018-05-30 19:16:41 +02:00
Thibaut Girka
28ccf0a464
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
Eugen Rochko
8205147d04
Bump version to 2.4.0
2018-05-22 19:39:35 +02:00
Thibaut Girka
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.
2018-05-21 16:40:02 +02:00
Eugen Rochko
bbdce87b80
Bump version to 2.4.0rc5
2018-05-21 16:05:31 +02:00
Thibaut Girka
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
Eugen Rochko
604eae1677
Bump version to 2.4.0rc4
2018-05-19 18:38:10 +02:00
Jenkins
4a3872d26e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-18 00:17:23 +00:00
MIYAGI Hikaru
7dbf83d6b8
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
Thibaut Girka
efd2441d1f
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
Eugen Rochko
dceab1af01
Bump version to 2.4.0rc3
2018-05-14 17:46:44 +02:00
Eugen Rochko
759b2b9c99
Bump version to 2.4.0rc2
2018-05-14 14:49:38 +02:00
Thibaut Girka
af504e62ff
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
Eugen Rochko
0dcb01855c
Bump version to 2.4.0rc1 ( #7283 )
2018-05-06 11:50:00 +02:00
Thibaut Girka
f8c7031f23
Point to glitch-soc source and not tootsuite on the public page
...
(hello AGPLv3)
2018-04-08 15:43:26 +02:00
Eugen Rochko
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
2018-03-27 04:33:57 +02:00
Eugen Rochko
3939ca8a33
Bump version to 2.3.2
2018-03-22 14:13:46 +01:00
Eugen Rochko
f4ef86a334
Bump version to 2.3.2rc5
2018-03-22 11:31:52 +01:00
Eugen Rochko
8ccf42c149
Bump version to 2.3.2rc4
2018-03-20 23:49:24 +01:00
Eugen Rochko
fd86b58568
Bump version to 2.3.2rc3
2018-03-19 12:20:57 +01:00
Eugen Rochko
a9538ac293
Bump version to 2.3.2rc2
2018-03-17 15:28:52 +01:00
Eugen Rochko
64d5c8a512
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
Eugen Rochko
61ad11683d
Bump version to 2.3.1
2018-03-13 15:50:15 +01:00
Eugen Rochko
3bf841c74e
Bump version to 2.3.1rc3
2018-03-13 09:21:21 +01:00
Eugen Rochko
9350e691cc
Bump version to 2.3.1rc2
2018-03-12 12:48:49 +01:00
Eugen Rochko
b744cfee18
Bump version to 2.3.1rc1
2018-03-11 15:13:13 +01:00
Eugen Rochko
f08bc1f188
Bump version to 2.3.0
2018-03-09 12:59:58 +01:00
Eugen Rochko
38e93a9541
Bump version to 2.3.0rc3
2018-03-08 11:19:02 +01:00
Eugen Rochko
5b2d4c84d9
Bump version to 2.3.0rc2
2018-03-07 12:06:23 +01:00
Eugen Rochko
4bd1403368
Bump version to 2.3.0rc1
2018-03-01 20:50:23 +01:00
Eugen Rochko
9d2cb4d12d
Bump version to 2.2.0
2018-01-29 01:12:36 +01:00
Eugen Rochko
de667c2a95
Bump to 2.2.0rc2
2018-01-24 04:16:30 +01:00
Eugen Rochko
b9794f1a49
Bump version to 2.2.0rc1
2018-01-20 16:27:19 +01:00
Eugen Rochko
87dd894cf4
Bump version to 2.1.3
2018-01-08 19:15:31 +01:00
Eugen Rochko
76268627c2
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
Eugen Rochko
a0273c2c5e
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
Daigo 3 Dango
64ae134e7b
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
Eugen Rochko
b23c9ab7de
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
Eugen Rochko
1079099d2b
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
Eugen Rochko
d4849787c5
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
Eugen Rochko
cae49f11c7
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
Eugen Rochko
a6fdeedb47
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
Eugen Rochko
3126869f5a
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
Eugen Rochko
11a9900269
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
Eugen Rochko
b222a9d5ee
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
Eugen Rochko
cb48c98e02
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
Eugen Rochko
7603119d3a
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
Eugen Rochko
03457653e9
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
Eugen Rochko
2e9c614e77
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
Eugen Rochko
f3c22d480e
Bump to 1.6.1
2017-09-16 03:08:29 +02:00
Eugen Rochko
6d13a61ea8
Bump to 1.6.0
2017-09-10 15:10:03 +02:00
Eugen Rochko
0e213d4b1a
Bump version to 1.6.0rc5
2017-09-10 10:26:51 +02:00
Eugen Rochko
fafd9d8bae
Bump version to 1.6.0rc4
2017-09-09 14:53:49 +02:00
Eugen Rochko
3b88fcd18b
Bump version to 1.6.0rc2
2017-09-06 19:02:03 +02:00
Eugen Rochko
c2cb70fe34
Bump version to 1.6.0rc1 ( #4768 )
2017-09-03 01:12:05 +02:00
Daigo 3 Dango
fd9d66dfd4
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
Eugen Rochko
1a8295b5ca
Bump to 1.5.1
2017-08-06 23:53:25 +02:00
Eugen Rochko
ace8b7cb1a
Bump to 1.5.0
2017-08-01 15:12:07 +02:00
Eugen Rochko
2c1fbae0b8
Bump to 1.5.0rc3
2017-07-31 15:28:36 +02:00
Eugen Rochko
52f32d5592
Bump to 1.5.0rc2
2017-07-28 17:22:41 +02:00
Eugen Rochko
6bfadd0390
Bump to 1.5.0rc1 ( #4318 )
2017-07-24 16:21:08 +02:00
Eugen Rochko
b5c4671c76
Bump version to 1.4.7
2017-06-28 17:44:17 +02:00
Eugen Rochko
81a2d672a7
Bump version to 1.4.6
2017-06-23 17:02:14 +02:00
Eugen Rochko
bd6bee29de
Bump version to 1.4.4
2017-06-20 21:32:37 +02:00
Eugen Rochko
1f042e5b43
Bump version to 1.4.3
2017-06-15 03:03:42 +02:00
Eugen Rochko
cd5c9d67e8
Bump version to 1.4.2
2017-06-08 15:30:43 +02:00
Eugen Rochko
abd41858a9
Bump version to 1.4.1
2017-05-28 19:30:38 +02:00
Eugen Rochko
b3479fa629
Bump version to 1.4.0.6
2017-05-28 16:32:53 +02:00
Eugen Rochko
ff78d90621
Bump version to 1.4.0.5
2017-05-27 16:56:47 +02:00
Eugen Rochko
a41a509a93
Bump version to 1.4.0.4
2017-05-26 14:16:04 +02:00
Eugen Rochko
664eef3527
Bump version
2017-05-22 21:38:19 +02:00
Eugen Rochko
662d103f6e
Bump version to 1.4.0.2 ( #3190 )
2017-05-20 23:30:20 +02:00
Eugen Rochko
f9efdccb97
Bump version to 1.3.2 ( #2623 )
2017-04-29 19:26:32 +02:00
Ash Furrow
f4093cdfe7
Update version to 1.3.1 ( #2571 )
2017-04-28 09:07:48 -04:00
Eugen Rochko
e21b9c875e
Bump version, improve how version is stored for better commit history ( #2526 )
2017-04-27 15:22:19 +02:00
Ash Furrow
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 .
2017-04-21 03:30:59 +02:00