Commit Graph

56 Commits

Author SHA1 Message Date
Brian Smith 28ecbdfa48 fix tests / move notification types to constants file 2013-03-31 17:49:47 -04:00
Brian Smith 5c59e55149 VRFS-281 added abstraction layer for notifications 2013-03-21 23:18:41 -04:00
Seth Call 8818588e91 * VRFS-259: removing reference to defunct admin_user model 2013-03-14 23:32:45 -05:00
Seth Call 42429d4395 * VRFS-259: beta signup 2013-03-14 23:22:31 -05:00
Mike Slemmer 997d0e3563 Fix for broken test 2013-02-16 01:33:58 -08:00
Mike Slemmer 42596d6506 Merge branch 'slemmer_20130122' 2013-02-16 01:23:57 -08:00
Seth Call 717f076cc7 * artifact_update; changes with sha1 2013-02-12 19:56:40 -06:00
Mike Slemmer e767deb875 fixed conflicts 2013-02-12 14:16:48 -08:00
Seth Call 47cc69a5f0 * adding artifact_updte table 2013-02-05 23:14:07 -06:00
Mike Slemmer 5d1af73685 more work 2013-01-29 21:46:40 -08:00
Mike Slemmer 60366d5c0e more work 2013-01-14 18:13:45 -08:00
Seth Call 7c2b5da509 * VRFS-217: replacing elasticsearch with pg 2013-01-13 22:50:38 -06:00
Brian Smith 225a81adb9 VRFS-80 session history 2013-01-06 15:46:48 -05:00
Brian Smith 97dd557854 VRFS-157 track API development 2012-12-15 02:11:04 -05:00
Brian Smith 05d8278a05 VRFS-102 - added models for musician/band likes 2012-12-03 22:39:57 -05: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 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 d73bbb822c VRFS-81 - recording/favorite development 2012-11-21 14:48:39 -05: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 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
Mike Slemmer 8846f5d3d3 added model 2012-11-13 13:20:04 -08:00
Seth Call 3c8761198e Merge branch 'elasticsearch' 2012-11-10 19:08:00 -06:00
Seth Call bca52caf20 * VRFS-32 UserMailer coming along 2012-11-10 19:07:17 -06:00
Seth Call 1968f1a80f * VRFS-32 merged 2012-11-07 22:06:58 -06:00
Seth Call 59d3f44478 * VRFS-32; integrating elasticsearch and /api/search completed 2012-11-07 07:10:41 -06:00
Brian Smith 7ffc952717 band follower APIs 2012-11-04 17:54:53 -05:00
Brian Smith 5d5a5d1f23 added user follower models 2012-11-04 08:33:51 -05:00
Seth Call 5657bebab8 * VRFS-61 and VRFS-34; session.tracks and instrument listing 2012-11-03 22:02:11 -05:00
Brian Smith bc3b0e5c57 add bands to user details API, renamed band/musician related user models 2012-10-30 01:42:16 -04:00
Brian Smith 662fcf0112 initial musician / band dev 2012-10-29 06:45:47 -04:00
Brian Smith 229ab95d34 updates for musicians 2012-10-27 22:35:28 -04:00
Seth Call 9ab04a7e74 * invitatations table and model build and tested 2012-10-26 05:33:39 -05:00
Seth Call a8f46f8d7d * VRFS-21; adding genres field to session CRUD 2012-10-25 07:11:10 -05:00
Seth Call e3027e831b * VRFS-18: removed transactions from conneciton manager 2012-10-22 19:59:35 -05:00
Seth Call 3e269f2551 * connection manager complete. now will integrate into jam-web and websocket-gateway 2012-10-21 10:05:06 -05:00
Seth Call d8dc08bef6 * VRFS-18; creating ConnectionManager which is responsible for managing data within the connections table 2012-10-20 20:55:49 -05:00
Seth Call 6650bf889a Merge branch 'VRFS-19' 2012-10-16 22:48:40 -05:00
Seth Call b829a0cdc3 * VRFS-19: adding amqp and logging gem to jam-ruby 2012-10-16 07:15:09 -05:00
Seth Call 6128621ce6 * VRFS-19 - jam-ruby looks to have client messaging integrated, but need to see if it works when used in jam-web 2012-10-15 21:09:57 -05:00
Brian Smith d7fb9850e8 include friend_request in jam_ruby 2012-10-14 22:02:55 -04:00
Brian Smith a250559b0f merge master 2012-10-07 00:57:23 -04:00
Seth Call 0f37d1523c * VRFS-15: new models for sessions REST API 2012-10-02 22:50:23 -05:00