asonix
c9c9c22db2
Merge branch 'asonix/changes' into asonix/downstream
2018-08-24 18:55:11 -05:00
asonix
ed5d2a9c37
Merge branch 'asonix/fix-themes' of asonix/mastodon into asonix/changes
2018-08-24 23:54:14 +00:00
asonix
f64adca068
Fix themes
2018-08-24 18:50:15 -05:00
asonix
a3ba83a157
Merge branch 'asonix/changes' into asonix/downstream
2018-08-24 18:46:52 -05:00
asonix
06b19206a5
Merge branch 'asonix/rename-theme' of asonix/mastodon into asonix/changes
2018-08-24 23:45:38 +00:00
asonix
d8ee4d9cf6
Rename 'dog' theme to 'Pop'
2018-08-24 18:43:16 -05:00
asonix
a06cdc6967
Update defaults
2018-08-24 17:55:57 -05:00
asonix
c430871001
Merge branch 'asonix/use-upstream-assets' of asonix/mastodon into asonix/changes
2018-08-24 22:53:27 +00:00
asonix
a360567a15
Merge branch 'v2.4.5-branch' of asonix/mastodon into asonix/changes
2018-08-24 22:53:00 +00:00
asonix
ee371616c3
Fix themes
2018-08-24 17:27:05 -05:00
asonix
b7dcefe02a
Set default mastodon theme, add translations
2018-08-24 17:25:12 -05:00
asonix
aafbc70eeb
Limit width
2018-08-24 17:19:54 -05:00
asonix
4a53e9d4df
Add more theme options, revert to 'sock' masto icons
2018-08-24 17:17:04 -05:00
asonix
4b5dc3422d
Merge branch 'asonix/changes' into v2.4.5-branch
2018-08-24 17:05:33 -05:00
Eugen Rochko
add3b63a0c
Bump version to 2.4.5
2018-08-24 20:11:40 +02:00
Eugen Rochko
221c8c771f
Prevent ActivityPub movedTo recursion ( #8092 )
...
Fix #8051
2018-08-24 20:11:16 +02:00
ThibG
a16d41e9fb
Fix FixAccountsUniqueIndex migration ( #8212 )
2018-08-24 20:10:18 +02:00
ThibG
f6ad5edbaa
Make some migration script more robust ( fixes #8007 ) ( #8170 )
...
Include a dummy Account class in the migration script containing only the
attributes relevant to the migration in order to not rely as much on the
codebase being in sync with the database schema.
2018-08-24 20:09:57 +02:00
Akihiko Odaki
3f4812c583
Fix index detection a migration to revert index change ( #8026 )
2018-08-24 20:09:13 +02:00
Eugen Rochko
86792bd309
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
2018-08-24 20:06:50 +02:00
asonix
0ab4dc8a5f
Merge branch 'asonix/link-to-others' of asonix/mastodon into asonix/changes
2018-08-24 13:21:08 +00:00
Ceralor
d04b032340
Added bitbucket, picarto, twitch, and reddit formats
2018-08-24 00:08:29 -05:00
asonix
39992f55c1
Add telegram link
2018-08-23 23:57:37 -05:00
asonix
85a01c54c4
Merge branch 'fix-locales' of asonix/mastodon into asonix/changes
2018-08-24 04:43:23 +00:00
asonix
0fd274e507
Don't call squeak 'en'
2018-08-23 23:41:54 -05:00
asonix
b9c86b6ccb
Merge branch 'fix-locales' of asonix/mastodon into asonix/changes
2018-08-24 04:23:46 +00:00
asonix
6d5d064461
Add option in UI for Squeak, use :en as fallback
2018-08-23 23:21:39 -05:00
asonix
3a98854fc4
Merge branch 'ceralor/changes' of asonix/mastodon into asonix/changes
2018-08-24 03:49:19 +00:00
Ceralor
589af2a0ab
Added squeak language, default to en
2018-08-23 22:42:40 -05:00
asonix
1b2f5bf6d1
Merge branch 'v2.4.4-branch' of asonix/mastodon into asonix/changes
2018-08-23 21:58:42 +00:00
asonix
8ab0d203a3
Merge branch 'asonix/changes' into v2.4.4-branch
2018-08-23 16:52:46 -05:00
Eugen Rochko
612d02028c
Bump version to 2.4.4
2018-08-22 20:56:43 +02:00
Eugen Rochko
f100e84372
Improve federated ID validation ( #8372 )
...
* Fix URI not being sufficiently validated with prefetched JSON
* Add additional id validation to OStatus documents, when possible
2018-08-22 20:56:26 +02:00
ThibG
31a209cb01
Upgrade doorkeeper to 4.4.2 ( #8321 )
2018-08-22 19:31:27 +02:00
Eugen Rochko
13a062a5d9
Upgrade Doorkeeper to 4.4.1 ( #8197 )
2018-08-22 19:30:02 +02:00
asonix
2bc91d3cac
Merge branch 'v2.4.3-branch' of asonix/mastodon into asonix/changes
2018-07-15 20:46:51 +00:00
asonix
e32713f1aa
Update translations
2018-07-15 15:35:29 -05:00
asonix
0fcf31ae7e
Merge asonix/changes
2018-07-15 15:27:01 -05:00
Akihiko Odaki
7a68608237
Fix index detection a migration to revert index change ( #8026 )
2018-07-15 14:56:00 +02:00
THE BOSS ♨
dc62195a06
Upgrade Node.js to v8.x on nvmrc ( #8023 )
2018-07-15 12:29:17 +09:00
Kevin Liu
68cccb00ef
Dockerfile: run asset precompilation as a build step ( #7780 )
...
* Dockerfile: run asset precompilation as a build step
* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
2018-07-15 01:19:09 +02:00
ThibG
955d5d36e8
Use LoadingBar instead of blur to indicate that an image is loading ( fixes #4060 ) ( #7562 )
2018-07-15 01:18:09 +02:00
Yamagishi Kazutoshi
af161e849d
Downgrade react-swipeable-views to v0.12.13 from v0.12.14 ( #8022 )
2018-07-15 01:01:01 +02:00
ThibG
d0d23b8f0a
Do not cause an error if domain_lists.blocks.next is undefined ( #8021 )
...
A valid URL is always truthy, so we can simplify this check
2018-07-14 23:28:29 +02:00
Yamagishi Kazutoshi
0eacf2b419
Upgrade Node.js to v8.x on Docker image ( #8019 )
2018-07-14 15:12:27 +02:00
Jeong Arm
0f0576ea06
Add missing Korean translations ( #8017 )
2018-07-14 18:27:27 +09:00
Eugen Rochko
2a176514be
Display full acct on public status pages, always ( #8011 )
2018-07-14 04:07:47 +02:00
Eugen Rochko
38e9662d78
Disable language detection for texts shorter than 140 characters ( #8010 )
...
If the input text is blank after preparation (only mention, or
only URL, or empty as in a media post), then use nil as language,
since it's OK to show to everyone.
Otherwise, always fall back to the server's default locale
2018-07-14 04:05:36 +02:00
Eugen Rochko
0180037dfb
Fix streaming API still using filtered instead of chosen languages ( #8009 )
2018-07-14 03:59:31 +02:00
Eugen Rochko
5a6645c922
Fix static GIFs being saved as empty files when using local storage ( #8012 )
...
Fix #7997
Fix #6237
2018-07-14 03:56:52 +02:00