Eugen Rochko
aa9c51a34c
Fix a couple unhandled exceptions
2017-01-23 13:56:57 +01:00
Eugen Rochko
4cbca05197
Potentially fix notifications issue
2017-01-23 13:43:14 +01:00
Eugen Rochko
a1894786cf
Potentially fix notifications issue
2017-01-23 13:43:14 +01:00
Eugen Rochko
a75cada495
Fix oembed controller test
2017-01-23 13:36:17 +01:00
Eugen Rochko
7c015ece45
Fix oembed controller test
2017-01-23 13:36:17 +01:00
Eugen
ac89d969c6
Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking
...
Textarea: fix clicking on name suggestions
2017-01-23 11:34:36 +01:00
Eugen
6062680dd4
Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking
...
Textarea: fix clicking on name suggestions
2017-01-23 11:34:36 +01:00
Misty De Meo
b7fb5b2b7e
Textarea: fix clicking on name suggestions
...
This was broken in 4afc1386
, which added an onBlur to hide the
suggestions when the textarea loses focus. Unfortunately, this fired
even when the textarea lost focus to its own suggestions box, and that
meant that onSuggestionClick is never called.
Setting a short window in which onSuggestionClick can still happen
before hiding the suggestion area ensures that clicking still works,
while still hiding the suggestions if the user clicks on something else.
2017-01-22 22:57:58 -08:00
Misty De Meo
33fd8a7d95
Textarea: fix clicking on name suggestions
...
This was broken in c3e9ba6a
, which added an onBlur to hide the
suggestions when the textarea loses focus. Unfortunately, this fired
even when the textarea lost focus to its own suggestions box, and that
meant that onSuggestionClick is never called.
Setting a short window in which onSuggestionClick can still happen
before hiding the suggestion area ensures that clicking still works,
while still hiding the suggestions if the user clicks on something else.
2017-01-22 22:57:58 -08:00
Eugen
20cb576da1
Fix inflection
2017-01-22 23:08:51 +01:00
Eugen
1953e3b6ed
Fix inflection
2017-01-22 23:08:51 +01:00
Eugen
f80c55b591
Fix error
2017-01-22 23:07:31 +01:00
Eugen
956da43e19
Fix error
2017-01-22 23:07:31 +01:00
Eugen
9a2a6b476b
Mitigate inconsistent notifications
2017-01-22 21:50:17 +01:00
Eugen
cea9fb31fe
Mitigate inconsistent notifications
2017-01-22 21:50:17 +01:00
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
61aee0006e
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 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