Commit graph

39694 commits

Author SHA1 Message Date
Eugen Rochko
67befe5463 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
Eugen
c66718afff 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
Effy Elden
f3cac0b93b 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
Eugen
10fe63d4db 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
Effy Elden
92a98f73aa 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
536cde4e99 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
2baf0fabb4 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
e92a1cf436 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
500278eb4c 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
e22a56183a 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
b4a4eb73ae 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
f036c6440b 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
e028406db4 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
d72dd38c13 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 Rochko
3a4b5961be 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
Eugen
deedf133d3 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
77746240aa 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
Effy Elden
106dd1a484 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
Eugen
6b666db112 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
8f21f5522f 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
Effy Elden
5fef55c11a 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
1aae0cfc2c 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
9bd3b11cfb 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 Rochko
05abd977c1 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
Eugen
f4e28785f1 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