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
David Yip
976347fa78
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-04 03:23:57 -05:00
David Yip
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
ThibG
f2ecedaab5
Fixes/do not override timestamps ( #7336 )
...
* Revert "Fixes/do not override timestamps (#7331 )"
This reverts commit 9c1e1005f4
.
* Document Snowflake ID corner-case a bit more
Snowflake IDs are used for two purposes: making object identifiers harder to
guess and ensuring they are in chronological order. For this reason, they
are based on the `created_at` attribute of the object.
Unfortunately, inserting items with older snowflakes IDs will break the
assumption of consumers of the paging APIs that new items will always have
a greater identifier than the last seen one.
* Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at
2018-05-03 23:02:46 +02:00
Eugen Rochko
0370c0f4d6
Add support for separate Redis for cache ( #7272 )
...
* Add support for separate Redis for cache
CACHE_REDIS_URL to allow using a different Redis server for cache
purposes, with cache-specific configuration such as key eviction
* Fix code style issues
2018-04-27 01:37:59 +02:00
Yamagishi Kazutoshi
3aee1034e5
Add extract_foreign_key_action to Mastodon::MigrationHelpers ( #7195 )
2018-04-20 12:21:28 +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
9c212f0f28
ASSET_HOST is wrong env variable. Fix to CDN_HOST ( #6372 )
2018-01-29 01:06:39 +01:00
Eugen Rochko
de667c2a95
Bump to 2.2.0rc2
2018-01-24 04:16:30 +01:00
Eugen Rochko
8f60c22ba4
Fix #6311 : Replace relative URLs in CSS only for Premailer ( #6335 )
2018-01-24 02:57:14 +01:00
Eugen Rochko
b9794f1a49
Bump version to 2.2.0rc1
2018-01-20 16:27:19 +01:00
Eugen Rochko
896cadceed
Improve HTML e-mails based on Litmus tests ( #6301 )
...
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
2018-01-20 01:32:21 +01:00
Eugen Rochko
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +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
Yamagishi Kazutoshi
fba46b6072
Using double splat operator ( #5859 )
2017-12-06 11:41:57 +01:00
ysksn
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09: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
aschmitz
93e3eaf95d
Fix #5329 ( #5332 )
...
This fixes #5329 , which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
2017-10-11 21:20:39 +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
007fce8c10
Set snowflake IDs for backdated statuses ( #5260 )
...
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
2017-10-08 17:34:34 +02:00