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
..
app	Merge branch 'master' into stream-for-photos	2012-04-18 18:30:54 -07:00
helpers	Newspaper theme selected by default, template picker object	2012-04-12 15:21:07 -07:00
support	Stylesheet naming issue (new-templates.css)	2012-03-29 01:29:07 -07:00
widgets	make lightbox work for photos page (+tests)	2012-02-22 14:45:43 +01:00
alert-spec.js	fixes for jasmine	2012-03-28 16:32:24 -07:00
bookmarklet-spec.js	added intentionally failing specs, because dirty input breaks bookmarklet	2012-02-18 16:26:09 -08:00
contact-list-spec.js
diaspora-spec.js
publisher-spec.js
rails-spec.js
search-spec.js	fix jasmine specs	2012-04-02 18:17:55 -07:00
validation-spec.js
view-spec.js	fix jasmine specs	2012-04-02 18:17:55 -07:00