Commit Graph

  • 4a0db8e97a merge Brian Smith 2012-11-17 23:05:08 -0500
  • 68ce5fd246 * VRFS-114 ; default test user is now a musician Seth Call 2012-11-17 22:00:38 -0600
  • 205380d91e more test cleanup Brian Smith 2012-11-17 22:56:23 -0500
  • 9cee5acccd removed name Brian Smith 2012-11-17 22:52:13 -0500
  • e27083e45c * VRFS-100 completed Seth Call 2012-11-17 21:41:26 -0600
  • 27266ca90a * VRFS-100 completed Seth Call 2012-11-17 21:41:12 -0600
  • 5ce8857648 Merge branch 'master' of bitbucket.org:jamkazam/jam-db Seth Call 2012-11-17 21:00:50 -0600
  • e372f6858e Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Seth Call 2012-11-17 21:00:03 -0600
  • 7b32358afa * VRFS-100; as_musician almost done Seth Call 2012-11-17 20:59:59 -0600
  • abac3cab38 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-11-17 21:49:10 -0500
  • b941a68a9c * more config-based testing Seth Call 2012-11-17 20:37:36 -0600
  • 2e61b2ba00 * making jam-web's test use the database.yml's test configs for connection info, not defaults (which is unix domain socket) Seth Call 2012-11-17 20:32:29 -0600
  • 97580572b7 * VRFS-100; as_musician added to connection table Seth Call 2012-11-17 15:14:34 -0600
  • 5b6360c709 Point at 127.0.0.1 to avoid unix sockets Jonathon Wilson 2012-11-17 13:39:24 -0600
  • e41b3a2417 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-11-16 22:14:38 -0500
  • e7fec41191 merging latest Brian Smith 2012-11-16 22:14:25 -0500
  • ea5e41ebee Merge branch 'master' of bitbucket.org:jamkazam/jam-db Brian Smith 2012-11-16 22:13:02 -0500
  • 8b65f6063f Merge branch 'master' of bitbucket.org:jamkazam/jam-web Seth Call 2012-11-15 20:59:36 -0600
  • ab3bb5f51e * VRFS-92 add music session stub params Seth Call 2012-11-15 20:50:48 -0600
  • 35f5c13283 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Seth Call 2012-11-15 20:50:13 -0600
  • 1a99565ea4 * VRFS-92 stub out music session params Seth Call 2012-11-15 20:50:03 -0600
  • 7e6276e04c * hiding vim files Seth Call 2012-11-15 20:49:50 -0600
  • 0aeea606fd * VRFS-92 merged Seth Call 2012-11-15 20:49:08 -0600
  • 81d7358380 * VRFS-92 stub out music session params Seth Call 2012-11-15 20:48:29 -0600
  • 9f7f19c7c2 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-11-15 21:10:40 -0500
  • 1547fb42cb VRFS-81 recordings and favorites Brian Smith 2012-11-15 21:10:35 -0500
  • 35126ad7a6 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Brian Smith 2012-11-15 21:08:42 -0500
  • 3fd79527ef VRFS-81 recordings and favorites Brian Smith 2012-11-15 21:08:37 -0500
  • b0a74a907e merge Brian Smith 2012-11-15 21:07:06 -0500
  • b450620433 VRFS-81 recordings and favorites Brian Smith 2012-11-15 21:04:35 -0500
  • a56e9e08e7 minor readme change Mike Slemmer 2012-11-15 01:31:18 -0800
  • 47b425b5ed some more work Mike Slemmer 2012-11-15 01:30:55 -0800
  • 96c16eb1e5 now oauth is working Mike Slemmer 2012-11-15 01:30:30 -0800
  • b4f0d3b9eb another set of oauth work Mike Slemmer 2012-11-15 00:47:19 -0800
  • 6b520b0a2b facebook integration work Mike Slemmer 2012-11-14 22:18:37 -0800
  • 436495b751 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Mike Slemmer 2012-11-14 21:51:57 -0800
  • 1e4e00962b merge Mike Slemmer 2012-11-14 21:13:42 -0800
  • dd63b8e5ad VRFS-89, VRFS-90 remove name from user model Brian Smith 2012-11-14 22:24:42 -0500
  • ecf792b404 VRFS-89, VRFS-90 remove name from user model Brian Smith 2012-11-14 22:24:30 -0500
  • 12e72d8c5f VRFS-89, VRFS-90 remove name from user model Brian Smith 2012-11-14 22:24:07 -0500
  • 645db0dfc6 merged Mike Slemmer 2012-11-14 12:09:17 -0800
  • c938c2c768 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Mike Slemmer 2012-11-14 12:08:36 -0800
  • ea7f9339a4 * trying out the login/logout as singleton pats Seth Call 2012-11-14 00:08:32 -0600
  • 0d3334a3b0 * VRFS-88 api/login done Seth Call 2012-11-13 23:57:10 -0600
  • 2d856351d7 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Seth Call 2012-11-13 23:37:56 -0600
  • bd41e615cf * VRFS-88; login/logout APIs done Seth Call 2012-11-13 23:37:50 -0600
  • ed76fe8699 * moving user_manager out of jam_ruby, but moving alot of logic within user_manager to User model Seth Call 2012-11-13 23:37:18 -0600
  • 32c1f07bb7 * VRFS-88; had to mark the test user as 'email_confirmed' Seth Call 2012-11-13 23:36:41 -0600
  • cb861a4aeb * adding jam-ruby gems into websocket-gateway gemfile for reasons I don't fully understand Seth Call 2012-11-13 21:08:50 -0600
  • d2f9a249c7 * adding jam-ruby gems into websocket-gateway gemfile for reasons I don't fully understand Seth Call 2012-11-13 21:07:28 -0600
  • 634eebb685 added model Mike Slemmer 2012-11-13 13:21:04 -0800
  • 8846f5d3d3 added model Mike Slemmer 2012-11-13 13:20:04 -0800
  • 02155614df merge fix, added file Mike Slemmer 2012-11-13 13:15:17 -0800
  • 166e3f26f1 modified manifest Mike Slemmer 2012-11-13 13:14:48 -0800
  • 1a81f6b58b Added authorization Mike Slemmer 2012-11-12 23:40:06 -0800
  • 2fb617cab7 Search. (VRFS-75) Jonathon Wilson 2012-11-12 21:12:17 -0700
  • 7982eec779 * adding signup VRFS-72 Seth Call 2012-11-12 22:15:27 -0600
  • 4b392f8cde *show.rabl resolved Seth Call 2012-11-12 21:14:23 -0600
  • 5309f46964 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Seth Call 2012-11-12 21:12:36 -0600
  • e18ce24527 * VRFS-72 merge Seth Call 2012-11-12 21:11:58 -0600
  • 5f3ed69c8e add account fields Brian Smith 2012-11-12 21:52:30 -0500
  • 5ba9302290 add account fields Brian Smith 2012-11-12 21:52:05 -0500
  • cc9168f9ad add account data Brian Smith 2012-11-12 21:51:37 -0500
  • c8f84918d4 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Mike Slemmer 2012-11-12 12:12:37 -0800
  • 049e9b7066 Omniauth routes Mike Slemmer 2012-11-12 12:12:32 -0800
  • a179e5b0f0 * VRFS-72 merged Seth Call 2012-11-12 07:26:13 -0600
  • 33c2bbd68e * VRFS-72 Seth Call 2012-11-12 07:26:02 -0600
  • 00bd6e4569 * VRFS-72 complete Seth Call 2012-11-12 07:20:38 -0600
  • 770134c883 * VRFS-72 merging conflicts, mostly because of FactoryGirl vs User.save Seth Call 2012-11-12 07:08:50 -0600
  • 6cce04e4e2 * VRFS-72 merging after getting first_last Seth Call 2012-11-12 07:00:54 -0600
  • 40710bc0fa * VRFS-72 Seth Call 2012-11-12 07:00:13 -0600
  • f624b4e32f * VRFS-72 complete Seth Call 2012-11-12 06:59:43 -0600
  • d55ba4fa5e * verified instruments working VRFS-72 Seth Call 2012-11-12 06:55:03 -0600
  • eb00be630b * UserManager added Seth Call 2012-11-12 06:28:44 -0600
  • 1239cad08f Good chunk of user profile (VRFS-74) Jonathon Wilson 2012-11-11 13:34:05 -0700
  • 3fc3c57e20 added name back to avoid breaking Brian Smith 2012-11-10 23:35:56 -0500
  • fc1a5c46f1 roll back Brian Smith 2012-11-10 23:26:13 -0500
  • f5db91c695 added first and last name fields Brian Smith 2012-11-10 23:25:28 -0500
  • a361e14a6e added first and last name fields Brian Smith 2012-11-10 23:24:28 -0500
  • b2880dc65a added first and last name fields Brian Smith 2012-11-10 23:23:38 -0500
  • 3c8761198e Merge branch 'elasticsearch' Seth Call 2012-11-10 19:08:00 -0600
  • bca52caf20 * VRFS-32 UserMailer coming along Seth Call 2012-11-10 19:07:17 -0600
  • bbaa18ba67 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-11-10 08:26:13 -0500
  • 50815ebbd2 add ability to delete band followings Brian Smith 2012-11-10 08:26:10 -0500
  • 2982cd998a added comment Mike Slemmer 2012-11-08 22:51:17 -0800
  • 27fb2f3ceb minor cleanup Mike Slemmer 2012-11-08 22:29:05 -0800
  • caaf4d6646 added 2 more needed gems Mike Slemmer 2012-11-08 20:55:18 -0800
  • 0674e5e1b2 added needed gem Mike Slemmer 2012-11-08 20:51:27 -0800
  • 034fee5d47 Merge branch 'master' of bitbucket.org:jamkazam/jam-db Seth Call 2012-11-08 21:41:25 -0600
  • 0914d6ff22 Up pg_migrate version to 0.1.6 Jonathon Wilson 2012-11-08 09:57:28 -0700
  • 331c95893c Merge branch 'master' of bitbucket.org:jamkazam/jam-web Jonathon Wilson 2012-11-08 08:49:00 -0700
  • 889887d79c VRFS-38. Invitations in create session. Jonathon Wilson 2012-11-08 08:13:47 -0700
  • f8604cb7f3 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Seth Call 2012-11-07 22:19:32 -0600
  • 1881718eb9 * suppressing the correct test so that stdout of rspec tests isn't broken up with curl debug statement from tire Seth Call 2012-11-07 22:13:11 -0600
  • 1f140dacc2 * VRFS-32 merged Seth Call 2012-11-07 22:08:16 -0600
  • 1968f1a80f * VRFS-32 merged Seth Call 2012-11-07 22:06:58 -0600
  • b86d1c9597 * VRFS-32; verified working on ubuntu Seth Call 2012-11-07 21:42:43 -0600
  • 8102ba9ec0 * VRFS-32; missed a bunch of new files Seth Call 2012-11-07 19:13:35 -0600
  • 6fe362a86b * VRFS-32; elaticsearch simple search api done Seth Call 2012-11-07 07:36:00 -0600
  • 59d3f44478 * VRFS-32; integrating elasticsearch and /api/search completed Seth Call 2012-11-07 07:10:41 -0600