Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ...

Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js

2011-08-20 14:40:56 -05:00

..

helpers

Starting spec for rails.js

2010-12-29 17:43:50 +01:00

support

Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged

2011-08-20 14:40:56 -05:00

widgets

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

alert-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

aspect-filters-spec.js

Fix jasmine spec for aspectFilters

2011-08-17 10:17:14 -07:00

contact-list-spec.js

fix jasmine specs

2011-02-26 06:16:34 -08:00

content-updater-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

diaspora-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

publisher-spec.js

Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged

2011-08-20 14:40:56 -05:00

rails-spec.js

publishing from a person profile page wip

2011-03-16 16:35:30 -07:00

stream-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

tag-followings-spec.js

Write jasmine test for the tag unfollow icon visibility

2011-08-09 22:54:31 +02:00

validation-spec.js

Add license to specs and notifications.js

2011-04-27 16:34:30 -05:00

view-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00

web-socket-receiver-spec.js

merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less

2011-08-10 23:57:33 -07:00