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 |
|
Mike Slemmer
|
1a81f6b58b
|
Added authorization
|
2012-11-12 23:40:06 -08:00 |
|
Seth Call
|
5309f46964
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-12 21:12:36 -06:00 |
|
Brian Smith
|
5ba9302290
|
add account fields
|
2012-11-12 21:52:05 -05:00 |
|
Seth Call
|
33c2bbd68e
|
* VRFS-72
|
2012-11-12 07:26:02 -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
|
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 |
|
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 |
|
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 |
|
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
|
8102ba9ec0
|
* VRFS-32; missed a bunch of new files
|
2012-11-07 19:13:35 -06:00 |
|
Seth Call
|
59d3f44478
|
* VRFS-32; integrating elasticsearch and /api/search completed
|
2012-11-07 07:10:41 -06:00 |
|
Brian Smith
|
78445ba25b
|
added analytics to user/band details
|
2012-11-05 23:47:50 -05:00 |
|
Brian Smith
|
4536cdc4eb
|
added location info
|
2012-11-05 21:55:08 -05: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
|
f9cc5f517f
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-03 22:51:21 -05:00 |
|
Brian Smith
|
1a366b2385
|
fix unit tests
|
2012-11-03 23:49:36 -04:00 |
|
Seth Call
|
aca5e758b4
|
* VRFS-34 and VRFS-61; forgot to add new connection_track model
|
2012-11-03 22:20:05 -05:00 |
|
Seth Call
|
54ac90d386
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-03 22:02:14 -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
|
d64e8962c7
|
band APIs
|
2012-11-03 15:32:27 -04:00 |
|
Brian Smith
|
b67a34d46d
|
use instrument id instead of description
|
2012-11-03 11:38:00 -04:00 |
|
Brian Smith
|
e81a68f5c8
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-03 09:55:10 -04:00 |
|
Brian Smith
|
e41fd71212
|
add support to create users / update instruments via API
|
2012-11-03 09:54:55 -04:00 |
|
Seth Call
|
be39434e1c
|
* VRFS-31; merging from master
|
2012-11-02 01:53:32 -05:00 |
|
Seth Call
|
2edaf4ca71
|
* list sessions has correct sort order
|
2012-11-02 01:51:52 -05:00 |