b06a375ee4
Merge branch 'blackle-boostspin'
Eugen Rochko
2017-01-24 14:28:54 +01:00
4f3264d291
Merge branch 'master' into boostspin
Eugen
2017-01-24 14:27:13 +01:00
4a146a0d18
Make boost animation an SVG that uses SCSS colours
blackle
2017-01-23 21:02:13 -05:00
21c209636d
Set isLoading false on timelines when request fails
Eugen Rochko
2017-01-24 13:04:12 +01:00
1f5792c834
API now respects ?limit param as long as it's within 2x default limit
Eugen Rochko
2017-01-24 04:22:10 +01:00
d9022884c6
Smarter infinite scroll
Eugen Rochko
2017-01-24 04:12:10 +01:00
bf0f6eb62d
Implement a click-to-view spoiler system
blackle
2017-01-12 23:54:26 -05:00
1761d3f9c3
Fix mistake
Eugen Rochko
2017-01-23 22:18:08 +01:00
d00189b55a
Domains with reject_media? set to true won't download avatars either
Eugen Rochko
2017-01-23 21:55:29 +01:00
8aab692034
Less re-rendering
Eugen Rochko
2017-01-23 21:40:48 +01:00
434cf8237e
Optional domain block attribute that prevents media attachments from being downloaded
Eugen Rochko
2017-01-23 21:36:08 +01:00
cca82bf0a2
Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive
Eugen Rochko
2017-01-23 21:29:34 +01:00
f392030ab8
Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses
Eugen Rochko
2017-01-23 21:09:27 +01:00
f2e08ff568
Remove unneeded block check
Eugen Rochko
2017-01-23 17:40:23 +01:00
6d98a73180
Domain blocks now have varying severity - auto-suspend vs auto-silence
Eugen Rochko
2017-01-23 17:38:38 +01:00
ef2b924679
Forgot to commit
Eugen Rochko
2017-01-23 17:18:41 +01:00
f855d645b2
Move all hex colors in SASS to variables and all variations to darken/lighten
Eugen Rochko
2017-01-23 16:01:46 +01:00
d4d56b8af0Fix#365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format
Eugen Rochko
2017-01-23 14:45:09 +01:00
aa9c51a34c
Fix a couple unhandled exceptions
Eugen Rochko
2017-01-23 13:56:57 +01:00
a1894786cf
Potentially fix notifications issue
Eugen Rochko
2017-01-23 13:43:14 +01:00
7c015ece45
Fix oembed controller test
Eugen Rochko
2017-01-23 13:36:17 +01:00
6062680dd4
Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking
Eugen
2017-01-23 11:34:36 +01:00
33fd8a7d95
Textarea: fix clicking on name suggestions
Misty De Meo
2017-01-22 22:57:58 -08:00
1953e3b6ed
Fix inflection
Eugen
2017-01-22 23:08:51 +01:00
956da43e19
Fix error
Eugen
2017-01-22 23:07:31 +01:00
cea9fb31fe
Mitigate inconsistent notifications
Eugen
2017-01-22 21:50:17 +01:00
61aee0006e
Override Rack::Request to use the same trusted proxy settings as Rails
Eugen Rochko
2017-01-22 21:01:28 +01:00
67befe5463
Allow to specify trusted proxies through env
Eugen Rochko
2017-01-22 20:35:49 +01:00
c66718afff
Merge pull request #509 from ineffyble/docs/developer-docs-additions
Eugen
2017-01-22 17:07:39 +01:00
f3cac0b93b
Update README.md to match new documentation (missed from previous commit)
Effy Elden
2017-01-23 00:11:09 +11:00
10fe63d4db
Merge pull request #508 from ineffyble/docs/developer-docs-additions
Eugen
2017-01-22 11:43:07 +01:00
92a98f73aa
Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.
Effy Elden
2017-01-22 19:50:40 +11:00
536cde4e99
Rename main docs page so it renders in github
Eugen Rochko
2017-01-21 22:54:49 +01:00
2baf0fabb4
Improve API docs formatting
Eugen Rochko
2017-01-21 22:53:02 +01:00
e92a1cf436
Add wiki contents to docs/ instead
Eugen Rochko
2017-01-21 22:49:08 +01:00
500278eb4c
Merge branch 'ineffyble-fix/error-pages'
Eugen Rochko
2017-01-21 22:31:19 +01:00
e22a56183a
Improve error page layouting. 500 page has to stay static because it's used from nginx when Rails fails.
Eugen Rochko
2017-01-21 22:30:47 +01:00
6b666db112
Merge pull request #505 from ineffyble/fix/issue-503
Eugen
2017-01-21 12:37:51 +01:00
8f21f5522f
Call uniq on the string version of mb_chars tags
Effy Elden
2017-01-21 21:02:42 +11:00
5fef55c11a
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
Effy Elden
2017-01-21 20:22:49 +11:00
1aae0cfc2cFix#475 - add space after autocomplete
Eugen Rochko
2017-01-20 21:39:41 +01:00
9bd3b11cfb
Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain
Eugen Rochko
2017-01-20 20:14:02 +01:00
05abd977c1
Fix preview cards layout, do preview card crawling for remote statuses
Eugen Rochko
2017-01-20 18:31:49 +01:00
f4e28785f1
Merge pull request #502 from blackle/vistoggle
Eugen
2017-01-20 13:27:20 +01:00
7f63edd820
Show visibility toggle on videos, show regardless of sensitivity
blackle
2017-01-19 21:24:30 -05:00
c8e4b9c663
No loading bars for cards, no failure if it 404s (that's expected)
Eugen Rochko
2017-01-20 01:07:53 +01:00
f0de621e76Fix#463 - Fetch and display previews of URLs using OpenGraph tags
Eugen Rochko
2017-01-20 01:00:14 +01:00
8d0284f8d9
Hide more non-essential loading bars
Eugen Rochko
2017-01-19 11:23:24 +01:00
98560b232a
Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil
Eugen Rochko
2017-01-19 11:06:06 +01:00
9b0941182f
Don't show loading bar when checking account timeline for newer stuff
Eugen Rochko
2017-01-19 11:01:01 +01:00
46be4631aeFix#222 - Update followers count when following/unfollowing
Eugen Rochko
2017-01-19 10:54:18 +01:00
f051c2e813
Fix statsd null backend not being initialized properly
Eugen Rochko
2017-01-19 09:37:07 +01:00
8b9206f7d9
Try to avoid any potential loops
Eugen
2017-01-19 02:14:57 +01:00
0439c7d58b
Move follow requests link above logout link in getting started column
Eugen Rochko
2017-01-16 11:35:32 +01:00
144402ec7e
Show visibility toggle on media gallery for sensitive images
blackle
2017-01-15 20:26:03 -05:00
3778355454
Merge pull request #478 from blackle/backflip
Eugen
2017-01-15 18:45:53 +01:00
383114add3
Change boost sprite to look like fa-retweet
blackle
2017-01-15 10:55:31 -05:00
926459fc0a
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
Eugen Rochko
2017-01-15 14:59:25 +01:00
7d7a11250cFix#427 - don't suggest hashtag if the search value contains a space
Eugen Rochko
2017-01-15 14:45:43 +01:00
1d5cbfa356Fix#449 - don't do relationships fetch for empty array of IDs
Eugen Rochko
2017-01-15 14:41:49 +01:00
cc1eccc8bcFix#466 - when logged in, make "get started" link to the frontpage instead of sign up
Eugen Rochko
2017-01-15 14:38:59 +01:00
16f9490d33
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
Eugen
2017-01-15 14:29:47 +01:00
bfec9aaee0
Merge branch 'ineffyble-feature/toot-app-source'
Eugen Rochko
2017-01-15 14:04:56 +01:00
e9737c2235
Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version
Eugen Rochko
2017-01-15 14:01:33 +01:00
1f7c0ad8d3
Merge pull request #464 from blackle/backflip
Eugen
2017-01-15 13:19:15 +01:00
a097dd489b
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
Effy Elden
2017-01-15 20:58:46 +11:00
777f527d86
Merge pull request #474 from ineffyble/add-back-link-to-settings
Eugen
2017-01-15 02:15:37 +01:00
e45fed58cb
Add a textual 'Back to Mastodon' link in footer of settings pages
Effy Elden
2017-01-15 11:03:35 +11:00
ed41f9f0b1
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
Effy Elden
2017-01-15 10:30:23 +11:00
3f84816b24
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
Effy Elden
2017-01-15 10:27:54 +11:00
a67ffcbf56
Make boost button arrows spin around
blackle
2017-01-13 23:32:27 -05:00
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
Effy Elden
2017-01-15 09:12:11 +11:00
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
Effy Elden
2017-01-15 09:10:44 +11:00
65122798b2
Fix typo in rel
Effy Elden
2017-01-15 09:04:14 +11:00
d6bc0e8db4
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves#11
Effy Elden
2017-01-15 08:58:50 +11:00
88801f7554
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
Eugen
2017-01-14 20:33:10 +01:00