Steven Hancock
f2922c943c
Cross-Origin Resource Sharing
...
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.
CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.
closes #2216
2012-03-10 23:49:56 -08:00
danielgrippi
61b4e77bde
Merge branch 'profiles'
2012-02-28 10:29:17 -08:00
Dennis Collective
7abbe4a642
Merge pull request #2925 from diasp/2833-conversations-should-return-json
...
Conversations should return json #2833
2012-02-27 17:34:10 -08:00
Dennis Collective
f5ef1e8c14
Merge pull request #2814 from stwf/aspects-javascript-fixes
...
update aspect name in aspects listing after editing.
2012-02-27 17:19:05 -08:00
danielgrippi
0112285985
Merge branch 'master' into profiles
...
Conflicts:
lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Maxwell Salzberg
49b0a44738
removing estates builder, as we are now using a template
2012-02-25 16:55:26 -08:00
Maxwell Salzberg
a1f39398be
Merge pull request #2902 from JMSilla/master
...
Fix atom feed bug (bug mash 7) [ci skip]
2012-02-25 16:47:13 -08:00
JMSilla
8178e0712c
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
2012-02-25 22:24:43 +00:00
danielgrippi
73f224e690
don't render page-viewer twice; last_post should actually get the last post posted, not the first one
2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc
MS DC show last post and show page works unauthenticated
...
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
Diaspora Europe
89179ecbd3
conversations should return JSON #2833
2012-02-24 09:39:40 +01:00
Dennis Collinson
9769dfb303
cukes passing
2012-02-23 17:24:19 -08:00
danielgrippi
b4923a77f0
add keybinding to the viewer
2012-02-22 19:19:24 -08:00
danielgrippi
8f3cc6769c
update reshare count when resharing; return PostPresenter for reshare root in the success response
2012-02-22 18:02:08 -08:00
danielgrippi
3ec7755c83
update reshare count when resharing; return PostPresenter for reshare root in the success response
2012-02-21 21:51:40 -08:00
danielgrippi
899136d0e5
display proper counts after feedback actions; modified destroy responses to return PostPresenter objects
2012-02-21 21:44:44 -08:00
danielgrippi
6965d6da24
fix feedback views. use gross callbacks for now
2012-02-21 15:23:29 -08:00
danielgrippi
f31418feb3
pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now
2012-02-21 15:23:29 -08:00
danielgrippi
30de08b340
fix post presenter / arrow ordering
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4
haxy auto comment functionality; try me and then revert me"
2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7
DG MS; added a new layout for post pages.
2012-02-21 15:23:27 -08:00
danielgrippi
ff875a5b3c
DG MS; determine what template to use on the client from the server
2012-02-21 15:23:27 -08:00
David Morley
a63bcd0080
make popular tags human readable
2012-02-19 21:28:12 -06:00
Maxwell Salzberg
28504f09bb
federation logger now in place.
2012-02-18 16:28:04 -08:00
Maxwell Salzberg
d7f56e556b
use the user presenter, luke
2012-02-18 16:28:03 -08:00
danielgrippi
debdd6cb6b
change routes to properly reflect page names (activity/stream).
2012-02-18 16:26:16 -08:00
Maxwell Salzberg
a81d1133cb
basic federation profile testing stuff
2012-02-18 16:26:16 -08:00
danielgrippi
2f7465450e
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-18 16:26:15 -08:00
danielgrippi
b139cc5479
DC DG; a participation is created in StatusMessageController
2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4
fix a bunch of small css related media box issues [ci skip]
2012-02-18 16:26:13 -08:00
Diaspora Europe
92b29d31db
added user_is_following method, added 2 model specs
2012-02-18 16:26:10 -08:00
Diaspora Europe
55cb328fe2
tags should be case insensitive
2012-02-18 16:26:10 -08:00
JMSilla
123e7ba3cb
Fix problem with atom feed entry titles being too long (2)
2012-02-18 16:20:02 +00:00
Maxwell Salzberg
ab727fc846
federation logger now in place.
2012-02-16 17:58:15 -08:00
Maxwell Salzberg
063912287c
use the user presenter, luke
2012-02-16 13:19:14 -08:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd
basic federation profile testing stuff
2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-13 19:13:43 -08:00
danielgrippi
44e072c330
DC DG; a participation is created in StatusMessageController
2012-02-10 16:42:21 -08:00
danielgrippi
ed3d5c429a
fix a bunch of small css related media box issues [ci skip]
2012-02-10 15:18:27 -08:00
Florian Staudacher
082d5c9fd4
initial photo page functionality is back, featuring backbone and handlebars
2012-02-09 20:55:34 +01:00
Diaspora Europe
8eda9aaf52
added user_is_following method, added 2 model specs
2012-02-09 14:17:43 +01:00
Diaspora Europe
47f7e10860
tags should be case insensitive
2012-02-09 14:17:43 +01:00
Dennis Collinson
74409d64b5
cleanup, yoq
2012-02-08 17:25:25 -08:00
Maxwell Salzberg
062204e963
Merge pull request #2848 from beardedninja/master
...
#2847 Users can now toggle nsfw on and off
2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323
Merge pull request #2839 from diasp/2036-fix-private-messages-navigation
...
#2036 Fix private messages are sometimes displayed without navigation
2012-02-08 16:59:50 -08:00
Dennis Collinson
94a7f5bb91
unsfw - sorry Kinky Joe!
2012-02-08 16:35:55 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
