Commit Graph

7876 Commits

Author SHA1 Message Date
Brian Smith 5ba9302290 add account fields 2012-11-12 21:52:05 -05:00
Brian Smith cc9168f9ad add account data 2012-11-12 21:51:37 -05:00
Mike Slemmer c8f84918d4 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-12 12:12:37 -08:00
Mike Slemmer 049e9b7066 Omniauth routes 2012-11-12 12:12:32 -08:00
Seth Call a179e5b0f0 * VRFS-72 merged 2012-11-12 07:26:13 -06:00
Seth Call 33c2bbd68e * VRFS-72 2012-11-12 07:26:02 -06:00
Seth Call 00bd6e4569 * VRFS-72 complete 2012-11-12 07:20:38 -06:00
Seth Call 770134c883 * VRFS-72 merging conflicts, mostly because of FactoryGirl vs User.save 2012-11-12 07:08:50 -06:00
Seth Call 6cce04e4e2 * VRFS-72 merging after getting first_last 2012-11-12 07:00:54 -06:00
Seth Call 40710bc0fa * VRFS-72 2012-11-12 07:00:13 -06:00
Seth Call f624b4e32f * VRFS-72 complete 2012-11-12 06:59:43 -06:00
Seth Call d55ba4fa5e * verified instruments working VRFS-72 2012-11-12 06:55:03 -06:00
Seth Call eb00be630b * UserManager added 2012-11-12 06:28:44 -06:00
Jonathon Wilson 1239cad08f Good chunk of user profile (VRFS-74) 2012-11-11 13:52:47 -07:00
Brian Smith 3fc3c57e20 added name back to avoid breaking 2012-11-10 23:35:56 -05:00
Brian Smith fc1a5c46f1 roll back 2012-11-10 23:26:13 -05:00
Brian Smith f5db91c695 added first and last name fields 2012-11-10 23:25:28 -05:00
Brian Smith a361e14a6e added first and last name fields 2012-11-10 23:24:28 -05:00
Brian Smith b2880dc65a added first and last name fields 2012-11-10 23:23:38 -05: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
Brian Smith bbaa18ba67 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-10 08:26:13 -05:00
Brian Smith 50815ebbd2 add ability to delete band followings 2012-11-10 08:26:10 -05:00
Mike Slemmer 2982cd998a added comment 2012-11-08 22:51:17 -08:00
Mike Slemmer 27fb2f3ceb minor cleanup 2012-11-08 22:29:05 -08:00
Mike Slemmer caaf4d6646 added 2 more needed gems 2012-11-08 20:55:18 -08:00
Mike Slemmer 0674e5e1b2 added needed gem 2012-11-08 20:51:27 -08:00
Seth Call 034fee5d47 Merge branch 'master' of bitbucket.org:jamkazam/jam-db 2012-11-08 21:41:25 -06:00
Jonathon Wilson 0914d6ff22 Up pg_migrate version to 0.1.6 2012-11-08 09:57:28 -07:00
Jonathon Wilson 331c95893c Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-08 08:49:00 -07:00
Jonathon Wilson 889887d79c VRFS-38. Invitations in create session. 2012-11-08 08:13:47 -07:00
Seth Call f8604cb7f3 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-07 22:19:32 -06:00
Seth Call 1881718eb9 * suppressing the correct test so that stdout of rspec tests isn't broken up with curl debug statement from tire 2012-11-07 22:13:11 -06:00
Seth Call 1f140dacc2 * VRFS-32 merged 2012-11-07 22:08:16 -06:00
Seth Call 1968f1a80f * VRFS-32 merged 2012-11-07 22:06:58 -06:00
Seth Call b86d1c9597 * VRFS-32; verified working on ubuntu 2012-11-07 21:42:43 -06:00
Seth Call 8102ba9ec0 * VRFS-32; missed a bunch of new files 2012-11-07 19:13:35 -06:00
Seth Call 6fe362a86b * VRFS-32; elaticsearch simple search api done 2012-11-07 07:36:00 -06:00
Seth Call 59d3f44478 * VRFS-32; integrating elasticsearch and /api/search completed 2012-11-07 07:10:41 -06:00
Seth Call 2872175b86 * bumping to pg_migrate 1.6 2012-11-07 06:56:59 -06:00
Brian Smith 453bc2b117 added ability to create band followers 2012-11-06 07:15:02 -05:00
Brian Smith 78445ba25b added analytics to user/band details 2012-11-05 23:47:50 -05:00
Brian Smith b8571b612d added analytics to user/band details 2012-11-05 23:47:19 -05:00
Brian Smith 2938c2b998 added location info 2012-11-05 21:55:25 -05:00
Brian Smith 4536cdc4eb added location info 2012-11-05 21:55:08 -05:00
Brian Smith 4822bf161f add location fields 2012-11-05 21:54:26 -05:00
Seth Call eccfc477a3 * bumping pg_migrate version to 0.1.6 2012-11-05 19:06:38 -06:00
Brian Smith 7ffc952717 band follower APIs 2012-11-04 17:54:53 -05:00
Brian Smith 1d9bb541ee band follower APIs 2012-11-04 17:54:14 -05:00
Brian Smith 83208d83bc added APIs to retrieve followers and followings 2012-11-04 08:34:59 -05:00