Seth Call 158a68c040 * teacher stopping point		2016-04-05 21:21:46 -05: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	* wip	2016-04-04 09:38:23 -05:00
features	* teacher stopping point	2016-04-05 21:21:46 -05:00
files	Merge and fix	2015-04-16 12:16:09 -05:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	* fix issues with music session 'other count' and tests	2014-11-09 10:59:31 -06:00
javascripts	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
managers	* wip	2016-01-29 15:16:35 -06:00
requests	* VRFS-3708 - allow redemption of gift cards	2015-11-13 07:12:58 -06:00
support	* screen emails	2016-01-04 13:42:11 -06:00
factories.rb	* schools	2016-04-01 16:40:08 -05:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	Squashed commit of the following:	2015-09-19 16:33:39 -05:00
teaspoon_env.rb	* merged	2014-09-22 14:20:58 -05:00
testing_oauth.txt	VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests.	2015-01-11 19:17:18 -06:00