Brian Smith 83c00ea6e4 merge develop		2015-03-29 10:12:42 -04:00
..
amqp	* make reconnect messages warn	2015-01-12 14:10:26 -06:00
app	* VRFS-2876 - pro licensing added and 20 second snippet	2015-03-10 22:10:22 -05:00
constants	Merge branch 'develop' into feature/musician_profile_enhancements	2015-03-09 20:25:28 -04:00
errors	VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots	2014-10-25 22:23:52 -04:00
geodata	* wip	2014-07-14 15:53:04 -05:00
lib	* VRFS-2909 - jam tracks importer	2015-03-09 09:44:12 -05:00
models	merge develop	2015-03-29 10:12:42 -04:00
resque	VRFS-2605 - audiomixer manifest updated for volume and offsets	2015-03-26 17:45:23 -05:00
base_manager.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
connection_manager.rb	* VRFS-2922 - show spinner for pending metronome	2015-03-12 21:53:23 -05:00
database.rb	* VRFS-1992 finished (daily session email improvements)	2014-08-01 16:17:04 -05:00
dbutil.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
environment.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
init.rb	* VRFS-2909 - jam tracks importer	2015-03-09 09:44:12 -05:00
jam_track_importer.rb	* VRFS-2876 - pro licensing added and 20 second snippet	2015-03-10 22:10:22 -05:00
jam_tracks_manager.rb	* merged develop	2015-03-24 11:27:26 -05:00
jmep_manager.rb	Merge with develop	2015-02-27 11:51:45 -06:00
message_factory.rb	* VRFS-2629 - one can follow the progression of a jam track being signed with detail	2015-01-09 11:23:20 -06:00
mq_router.rb	Conflicts:	2014-12-18 15:13:55 -06:00
recurly_client.rb	VRFS-2830 : Merge / manual fix	2015-03-25 10:56:24 -05:00
version.rb	* bumping gems to be version 0.1.X to match debs	2013-09-18 20:35:20 +00:00