Commit graph

38628 commits

Author SHA1 Message Date
Eugen Rochko
0430f7c0fa Fix spoiler_text not having "not null" constraint 2017-01-25 15:24:19 +01:00
Eugen Rochko
30abab790e Fix order of migrations 2017-01-25 15:01:00 +01:00
Eugen Rochko
51a7047367 Fix order of migrations 2017-01-25 15:01:00 +01:00
Eugen Rochko
2627571ba4 Add content warning example to docs 2017-01-25 02:54:28 +01:00
Eugen Rochko
ca04002c93 Add content warning example to docs 2017-01-25 02:54:28 +01:00
Eugen Rochko
92b8fc56a8 Add description of Mastodon's current protocol extensions 2017-01-25 02:46:16 +01:00
Eugen Rochko
ab94ad3504 Add description of Mastodon's current protocol extensions 2017-01-25 02:46:16 +01:00
Eugen
bd00d67b04 Merge pull request #524 from blackle/master
fix up spoilers
2017-01-25 02:16:36 +01:00
Eugen
41f5459af5 Merge pull request #524 from blackle/master
fix up spoilers
2017-01-25 02:16:36 +01:00
blackle
fa25fc812d fix up spoilers 2017-01-24 20:14:20 -05:00
blackle
ca13ec04a8 fix up spoilers 2017-01-24 20:14:20 -05:00
Eugen Rochko
e17b31bca6 Fix #522 - prevent blocked users from reblogging 2017-01-25 01:48:46 +01:00
Eugen Rochko
10ffd455a8 Fix #522 - prevent blocked users from reblogging 2017-01-25 01:48:46 +01:00
Eugen Rochko
89c86c226d Merge branch 'blackle-master' 2017-01-25 01:29:40 +01:00
Eugen Rochko
ca28d9c2ae Merge branch 'blackle-master' 2017-01-25 01:29:40 +01:00
Eugen Rochko
959e064186 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
2017-01-25 01:29:16 +01:00
Eugen Rochko
999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
2017-01-25 01:29:16 +01:00
Eugen
c7778752e3 Merge branch 'master' into master 2017-01-24 21:56:06 +01:00
Eugen
f8da0dd490 Merge branch 'master' into master 2017-01-24 21:56:06 +01:00
Eugen Rochko
ea8b548ee9 Make blocks create entries and unfollows instantly, but do the clean up
in the background instead. Should fix delay where blocked person
can interact with blocker for a short time before background job
gets processed
2017-01-24 21:40:41 +01:00
Eugen Rochko
8a880a3d46 Make blocks create entries and unfollows instantly, but do the clean up
in the background instead. Should fix delay where blocked person
can interact with blocker for a short time before background job
gets processed
2017-01-24 21:40:41 +01:00
Eugen
f0b49d04ba Merge pull request #521 from mistydemeo/fix_invisible_css
Fix `invisible` CSS class
2017-01-24 21:26:18 +01:00
Eugen
326c75b35b Merge pull request #521 from mistydemeo/fix_invisible_css
Fix `invisible` CSS class
2017-01-24 21:26:18 +01:00
Misty De Meo
6b829eea23 Fix invisible CSS class 2017-01-24 11:49:31 -08:00
Misty De Meo
adda642c63 Fix invisible CSS class 2017-01-24 11:49:31 -08:00
Eugen Rochko
593737499e Fix links in toots opening the toot at first 2017-01-24 18:51:09 +01:00
Eugen Rochko
e47b8e778b Fix links in toots opening the toot at first 2017-01-24 18:51:09 +01:00
Eugen Rochko
cb33960e0e Fix #204, fix #515 - URL truncating is now a style so copypasting is not
affected, replaced onClick handler with onMouseUp/Down to detect text
selection not trigger onClick handler then
2017-01-24 17:05:44 +01:00
Eugen Rochko
80cefd5b3c Fix #204, fix #515 - URL truncating is now a style so copypasting is not
affected, replaced onClick handler with onMouseUp/Down to detect text
selection not trigger onClick handler then
2017-01-24 17:05:44 +01:00
Eugen Rochko
2173889c48 Merge branch 'blackle-boostspin' 2017-01-24 14:28:54 +01:00
Eugen Rochko
b06a375ee4 Merge branch 'blackle-boostspin' 2017-01-24 14:28:54 +01:00
Eugen
1df5242352 Merge branch 'master' into boostspin 2017-01-24 14:27:13 +01:00
Eugen
4f3264d291 Merge branch 'master' into boostspin 2017-01-24 14:27:13 +01:00
blackle
cc579e1b61 Make boost animation an SVG that uses SCSS colours 2017-01-24 07:48:13 -05:00
blackle
4a146a0d18 Make boost animation an SVG that uses SCSS colours 2017-01-24 07:48:13 -05:00
Eugen Rochko
604c654f8d Set isLoading false on timelines when request fails 2017-01-24 13:04:12 +01:00
Eugen Rochko
21c209636d Set isLoading false on timelines when request fails 2017-01-24 13:04:12 +01:00
Eugen Rochko
b4ec84067a API now respects ?limit param as long as it's within 2x default limit 2017-01-24 04:22:10 +01:00
Eugen Rochko
1f5792c834 API now respects ?limit param as long as it's within 2x default limit 2017-01-24 04:22:10 +01:00
Eugen Rochko
271569fffb Smarter infinite scroll 2017-01-24 04:12:10 +01:00
Eugen Rochko
d9022884c6 Smarter infinite scroll 2017-01-24 04:12:10 +01:00
blackle
e25fc71c2c Implement a click-to-view spoiler system 2017-01-23 21:07:40 -05:00
blackle
bf0f6eb62d Implement a click-to-view spoiler system 2017-01-23 21:07:40 -05:00
Eugen Rochko
b1322bf315 Fix mistake 2017-01-23 22:18:08 +01:00
Eugen Rochko
1761d3f9c3 Fix mistake 2017-01-23 22:18:08 +01:00
Eugen Rochko
9650e27b7b Domains with reject_media? set to true won't download avatars either 2017-01-23 21:55:29 +01:00
Eugen Rochko
d00189b55a Domains with reject_media? set to true won't download avatars either 2017-01-23 21:55:29 +01:00
Eugen Rochko
3bd02ca121 Less re-rendering 2017-01-23 21:40:48 +01:00
Eugen Rochko
8aab692034 Less re-rendering 2017-01-23 21:40:48 +01:00
Eugen Rochko
3710d18889 Optional domain block attribute that prevents media attachments from being downloaded 2017-01-23 21:36:08 +01:00