Jonathan Kolyer b48a298af5 merge conflict		2013-11-03 03:16:14 -06:00
..
assets/images	* VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes	2013-10-22 14:27:20 -05:00
controllers	* VRFS-831 - looks finished	2013-11-03 15:23:46 -06:00
features	* I can't keep straight what's pending and what's not	2013-10-24 14:59:21 -05:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	merging jam-web into web	2013-09-15 18:04:37 +00:00
javascripts	merging jam-web into web	2013-09-15 18:04:37 +00:00
managers	* VRFS-767, VRFS-781 - create account page updated, web layout will now expand black bar as needed	2013-10-22 12:38:21 -05:00
requests	vrfs-774: changing country value from USA to US for max_mind_geo support	2013-11-03 01:49:10 -06:00
support	* VRFS-767, VRFS-781 - create account page updated, web layout will now expand black bar as needed	2013-10-22 12:38:21 -05:00
factories.rb	vrfs-774: changing country value from USA to US for max_mind_geo support	2013-11-03 01:49:10 -06:00
spec_db.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
spec_helper.rb	* VRFS-780 - finished, tested, etc	2013-10-21 17:13:53 -05:00