danielgrippi e379a6df0f Merge branch 'master' into stream-for-photos ... Conflicts: app/assets/javascripts/app/views/stream_view.js		2012-04-18 18:30:54 -07:00
..
post	DG DC; visual fixups	2012-04-04 18:59:19 -07:00
post-viewer	upgrade backbone, fix tests	2012-04-03 16:31:52 -07:00
aspects_dropdown_view.js	change new publisher to public by default to make testing easier	2012-04-17 16:43:42 -07:00
comment_stream_view.js	framer has better styling	2012-04-04 18:59:19 -07:00
comment_view.js	DG DC; visual fixups	2012-04-04 18:59:19 -07:00
content_view.js	refactored stream and Stream View	2012-04-17 21:06:34 -07:00
feedback_view.js
header_view.js
likes_info_view.js
photo_view.js
photo_viewer.js	update new js files	2012-03-27 18:26:46 -07:00
photos_view.js	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
post_view.js	DG DC; visual fixups	2012-04-04 18:59:19 -07:00
publisher_view.js	don't set publisher height on focus (already done in css), fixes #3109	2012-04-06 21:21:35 +02:00
services_selector_view.js	update new js files	2012-03-27 18:26:46 -07:00
stream_faces_view.js	use app.models.Stream instead of app.models.Photos,	2012-04-18 20:20:56 +02:00
stream_object_view.js
stream_post_views.js	refactored stream and Stream View	2012-04-17 21:06:34 -07:00
stream_view.js	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
template_picker_view.js	Wallpaper frame selected when post has one photo	2012-04-12 11:56:27 -07:00