nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec
History
danielgrippi 648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
..
config Add rcov task 2011-03-01 18:12:42 -08:00
controllers Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
fixtures Fix data conversion, fixture generation in publicscontroller 2011-01-26 18:39:09 -08:00
helpers moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
integration Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
javascripts Fix incorrect jasmine spy usage.. GREEN? 2011-04-29 23:19:37 -05:00
lib Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
mailers request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
models Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
shared_behaviors added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags 2011-04-30 00:08:33 +02:00
support Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
factories.rb Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
helper_methods.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
misc_spec.rb Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
spec_helper.rb Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00