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
..
assets	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
controllers	kinda ugly hack for ports in url with iframes	2012-04-18 16:12:57 -07:00
helpers	kinda ugly hack for ports in url with iframes	2012-04-18 16:12:57 -07:00
mailers	~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated	2012-04-09 00:25:08 +02:00
models	deterministic stream order take 2, this time with spec	2012-04-12 16:33:02 +02:00
presenters	oembed mostly works	2012-04-18 16:12:56 -07:00
uploaders	added support for uploading images with .tiff extensions	2012-01-02 21:40:46 -05:00
views	oembed mostly works	2012-04-18 16:12:56 -07:00