Commit graph

9728 commits

Author SHA1 Message Date
Eugen Rochko
e161d2acdc Override Rack::Request to use the same trusted proxy settings as Rails 2017-01-22 21:01:28 +01:00
Eugen Rochko
ef376b0bfd Allow to specify trusted proxies through env 2017-01-22 20:35:49 +01:00
Eugen
13db91a0c1 Merge pull request #509 from ineffyble/docs/developer-docs-additions
Update README.md to match new documentation (missed from previous commit)
2017-01-22 17:07:39 +01:00
Effy Elden
3055b5af69 Update README.md to match new documentation (missed from previous commit) 2017-01-23 00:11:09 +11:00
Eugen
d9b56c87a1 Merge pull request #508 from ineffyble/docs/developer-docs-additions
Documentation tweaks
2017-01-22 11:43:07 +01:00
Effy Elden
65748b7623 Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'. 2017-01-22 19:50:40 +11:00
Eugen Rochko
446cce198b Rename main docs page so it renders in github 2017-01-21 22:54:49 +01:00
Eugen Rochko
7769fb6a5a Improve API docs formatting 2017-01-21 22:53:02 +01:00
Eugen Rochko
954f82410c Add wiki contents to docs/ instead 2017-01-21 22:51:02 +01:00
Eugen Rochko
e01d255039 Merge branch 'ineffyble-fix/error-pages' 2017-01-21 22:31:19 +01:00
Eugen Rochko
2c29cc400e Improve error page layouting. 500 page has to stay static because it's
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
Eugen Rochko
280348f1e0 Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages 2017-01-21 22:20:01 +01:00
Eugen Rochko
6c54bfc9f7 Merge branch 'ineffyble-master' 2017-01-21 22:19:27 +01:00
Eugen Rochko
7344c75a27 Fix code style 2017-01-21 22:19:13 +01:00
Eugen Rochko
3916a753d2 Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master 2017-01-21 22:15:22 +01:00
Eugen Rochko
f4836b9077 Method to fetch a single notification 2017-01-21 22:14:13 +01:00
Eugen
9ed28b1081 Merge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image
Add a default missing.png header image - fixes #492
2017-01-21 20:56:11 +01:00
Effy Elden
4dd4664b10 Change missing.png header to 1x1 transparent PNG 2017-01-22 06:42:42 +11:00
Effy Elden
d6d5a05e02 Add a default missing.png header image - fixes #492 2017-01-22 05:19:31 +11:00
Eugen
11cbbab564 Merge pull request #505 from ineffyble/fix/issue-503
Call uniq on the string version of mb_chars tags - fixes #503
2017-01-21 12:37:51 +01:00
Effy Elden
26cfebf434 Call uniq on the string version of mb_chars tags 2017-01-21 21:02:42 +11:00
Effy Elden
432cc1d3c1 Set remote dev environments to use letter_opener_web, add default .env.vagrant variables 2017-01-21 20:22:49 +11:00
Eugen Rochko
bfe579499b Fix #475 - add space after autocomplete 2017-01-20 21:39:41 +01:00
Eugen Rochko
d8d22cfa6f Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain 2017-01-20 20:14:02 +01:00
Eugen Rochko
9d09b2c6b1 Fix preview cards layout, do preview card crawling for remote statuses 2017-01-20 18:31:49 +01:00
Eugen
f3eb326b19 Merge pull request #502 from blackle/vistoggle
Show visibility toggle on videos, show regardless of sensitivity
2017-01-20 13:27:20 +01:00
blackle
6ebca2ce6b Show visibility toggle on videos, show regardless of sensitivity 2017-01-19 21:24:30 -05:00
Eugen Rochko
d1fbfbe689 No loading bars for cards, no failure if it 404s (that's expected) 2017-01-20 01:07:53 +01:00
Eugen Rochko
f748a91ec7 Fix #463 - Fetch and display previews of URLs using OpenGraph tags 2017-01-20 01:00:14 +01:00
Eugen Rochko
b75967ae52 Hide more non-essential loading bars 2017-01-19 11:23:24 +01:00
Eugen Rochko
a88f9a5ca9 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 2017-01-19 11:06:06 +01:00
Eugen Rochko
a388d1c8fe Don't show loading bar when checking account timeline for newer stuff 2017-01-19 11:01:01 +01:00
Eugen Rochko
5fecdd7780 Fix #222 - Update followers count when following/unfollowing
Also, since the root component connects to the stream that updates home/notification columns,
there is pretty much no case for refreshing those columns beyond initial load. So, move the
loading of those columns into the root component, to prevent unneccessary reloads when switching tabs
on mobile or resizing desktop window between mobile/desktop layouts
2017-01-19 10:54:18 +01:00
Eugen Rochko
31d48af0d1 Fix statsd null backend not being initialized properly 2017-01-19 09:37:07 +01:00
Eugen
788e884690 Try to avoid any potential loops 2017-01-19 02:14:57 +01:00
Eugen Rochko
86264a950c Add optional StatsD performance tracking 2017-01-18 23:44:29 +01:00
Eugen Rochko
0022b0cb2e Fix forgotten change of settings 2017-01-17 20:37:54 +01:00
Eugen Rochko
40a5094434 Fix boops? 2017-01-17 20:28:32 +01:00
Eugen Rochko
a6bf7b4777 Fix #487 2017-01-17 20:11:16 +01:00
Eugen Rochko
7865ce28e5 Add sounds for notifications. Boop by @jk@mastodon.social 2017-01-17 20:09:03 +01:00
Eugen
7970f1dd38 Merge pull request #489 from ineffyble/master
Add Heroku deployment support
2017-01-17 18:46:53 +01:00
Effy Elden
a898072d76 Add Heroku deployment support 2017-01-17 22:00:03 +11:00
Eugen Rochko
3f30e91462 Improve how the list entry Account component looks when target is blocked/follow is requested 2017-01-16 19:36:32 +01:00
Eugen
0e71cb2916 Merge pull request #486 from blackle/replytimeline
Show 'do not display in public timeline' when replying to self
2017-01-16 16:38:08 +01:00
blackle
94cedabbe3 Show 'do not display in public timeline' when replying to self 2017-01-16 10:26:44 -05:00
Eugen Rochko
89740d69ec Fix upload file input being re-rendered needlessly 2017-01-16 14:21:55 +01:00
Eugen Rochko
f4d7f4c687 Fix #238 - Add "favourites" column 2017-01-16 13:28:25 +01:00
Eugen Rochko
81db795253 Fix #414 - Improve lightbox, add loading indicator 2017-01-16 12:04:02 +01:00
Eugen Rochko
1ed33af06c Merge branch 'blackle-sensitive' 2017-01-16 11:37:35 +01:00
Eugen Rochko
780df33037 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive 2017-01-16 11:36:02 +01:00