Commit Graph

107 Commits

Author SHA1 Message Date
Mike Slemmer a5f6bc725a reset password work 2012-12-21 16:56:16 -08:00
Brian Smith db2f16c471 refactor 2012-12-17 02:02:20 -05:00
Brian Smith 45600115f7 VRFS-120 - completed Likes for Users and Bands 2012-12-17 01:01:48 -05:00
Brian Smith 9ca701d99e Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-12-16 18:24:23 -05:00
Brian Smith 37d24a0c0e VRFS-120 - Likes module 2012-12-16 18:24:14 -05:00
Mike Slemmer dea34e1b91 Merge branch 'master' into slemmer_20121211 2012-12-16 12:27:20 -08:00
Brian Smith 5e0004f854 removed connection_track model 2012-12-16 08:28:07 -05:00
Brian Smith 97dd557854 VRFS-157 track API development 2012-12-15 02:11:04 -05:00
Mike Slemmer 59e6d82ef3 send email 2012-12-14 01:16:54 -08:00
Mike Slemmer 0a4e41e5d1 set_password plus some refactoring 2012-12-13 19:32:23 -08:00
Mike Slemmer 7ff103a430 more work 2012-12-13 09:15:47 -08:00
Mike Slemmer c068f2ca16 work 2012-12-11 14:59:37 -08:00
Brian Smith 5e87d00732 VRFS-33 - save invitation receivers as part of session settings 2012-12-10 00:53:21 -05:00
Seth Call 990e4c1a0d * require 'legal_terms' boolean = true on create session 2012-12-09 16:11:01 -06:00
Seth Call af8bee6084 * VRFS-149; bootstrap dev users 2012-12-09 14:56:35 -06:00
Brian Smith 21f09ecd69 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-12-08 23:06:07 -05:00
Brian Smith 7a345f2163 VRFS-33 added session settings 2012-12-08 23:05:54 -05:00
Seth Call f3327d0014 * VRFS-134; default users to musicians for now 2012-12-06 20:54:01 -06:00
Mike Slemmer 5472324a1a Got friend and band index working 2012-12-05 17:56:12 -08:00
Mike Slemmer 9fd6b45ab2 work 2012-12-05 11:10:58 -08:00
Mike Slemmer 95971fed66 Another fix 2012-12-03 23:00:32 -08:00
Mike Slemmer e4e9ec293e fixed query (i hope) and added some new tests 2012-12-03 22:37:36 -08:00
Brian Smith 05d8278a05 VRFS-102 - added models for musician/band likes 2012-12-03 22:39:57 -05:00
Brian Smith 9371e7b0e8 VRFS-117 - added recording genre support 2012-12-02 02:06:51 -05:00
Seth Call e155fd3f1e * meant to remove limit_to_three_genres; left that in by mistake 2012-11-30 10:14:22 -06:00
Seth Call 77282dd3ee * VRFS-98 merged 2012-11-30 09:26:15 -06:00
Seth Call dc8aca38f6 * VRFS-98: join_request added and related changes 2012-11-30 09:23:43 -06:00
Brian Smith 062dfe481c VRFS 79 add image URL fields to users and bands tables 2012-11-28 00:26:53 -05:00
Brian Smith 4c1b0bc5c6 VRFS-82 band invitation complete 2012-11-25 22:35:48 -05:00
Brian Smith 74a949849f VRFS-82 more band invitation development / unit test enhancements 2012-11-25 14:37:54 -05:00
Brian Smith 205725f4e3 VRFS-82 band invitation development 2012-11-24 13:22:44 -05:00
Brian Smith 55c9c1f200 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-22 03:27:50 -05:00
Brian Smith 4d20f49d41 VRFS-81 2012-11-22 03:27:23 -05:00
Mike Slemmer 7381c20441 fix merge 2012-11-21 23:57:32 -08:00
Mike Slemmer 969b003bc9 add confirm method 2012-11-21 23:54:58 -08:00
Brian Smith d73bbb822c VRFS-81 - recording/favorite development 2012-11-21 14:48:39 -05:00
Seth Call 27266ca90a * VRFS-100 completed 2012-11-17 21:41:12 -06:00
Seth Call e372f6858e Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-17 21:00:03 -06:00
Seth Call 7b32358afa * VRFS-100; as_musician almost done 2012-11-17 20:59:59 -06:00
Brian Smith e7fec41191 merging latest 2012-11-16 22:14:25 -05:00
Seth Call 35f5c13283 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-15 20:50:13 -06:00
Seth Call 1a99565ea4 * VRFS-92 stub out music session params 2012-11-15 20:50:03 -06:00
Brian Smith 35126ad7a6 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-15 21:08:42 -05:00
Brian Smith 3fd79527ef VRFS-81 recordings and favorites 2012-11-15 21:08:37 -05:00
Mike Slemmer 47b425b5ed some more work 2012-11-15 01:30:55 -08:00
Mike Slemmer 436495b751 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-14 21:51:57 -08:00
Brian Smith ecf792b404 VRFS-89, VRFS-90 remove name from user model 2012-11-14 22:24:30 -05:00
Mike Slemmer c938c2c768 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-14 12:08:36 -08:00
Seth Call ed76fe8699 * moving user_manager out of jam_ruby, but moving alot of logic within user_manager to User model 2012-11-13 23:37:18 -06:00
Mike Slemmer 634eebb685 added model 2012-11-13 13:21:04 -08:00