 Seth Call
|
2e61b2ba00
|
* making jam-web's test use the database.yml's test configs for connection info, not defaults (which is unix domain socket)
|
2012-11-17 20:32:29 -06:00 |
|
Seth Call
|
97580572b7
|
* VRFS-100; as_musician added to connection table
|
2012-11-17 15:14:34 -06:00 |
Jonathon Wilson
|
5b6360c709
|
Point at 127.0.0.1 to avoid unix sockets
|
2012-11-17 13:39:24 -06:00 |
Brian Smith
|
e41b3a2417
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-16 22:14:38 -05:00 |
|
Brian Smith
|
e7fec41191
|
merging latest
|
2012-11-16 22:14:25 -05:00 |
|
Brian Smith
|
ea5e41ebee
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-db
|
2012-11-16 22:13:02 -05:00 |
|
Seth Call
|
8b65f6063f
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-15 20:59:36 -06:00 |
|
Seth Call
|
ab3bb5f51e
|
* VRFS-92 add music session stub params
|
2012-11-15 20:50:48 -06: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 |
|
Seth Call
|
7e6276e04c
|
* hiding vim files
|
2012-11-15 20:49:50 -06:00 |
|
Seth Call
|
0aeea606fd
|
* VRFS-92 merged
|
2012-11-15 20:49:08 -06:00 |
|
Seth Call
|
81d7358380
|
* VRFS-92 stub out music session params
|
2012-11-15 20:48:29 -06:00 |
|
Brian Smith
|
9f7f19c7c2
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-15 21:10:40 -05:00 |
|
Brian Smith
|
1547fb42cb
|
VRFS-81 recordings and favorites
|
2012-11-15 21:10:35 -05: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 |
|
Brian Smith
|
b0a74a907e
|
merge
|
2012-11-15 21:07:06 -05:00 |
|
Brian Smith
|
b450620433
|
VRFS-81 recordings and favorites
|
2012-11-15 21:04:35 -05:00 |
Mike Slemmer
|
a56e9e08e7
|
minor readme change
|
2012-11-15 01:31:18 -08:00 |
|
Mike Slemmer
|
47b425b5ed
|
some more work
|
2012-11-15 01:30:55 -08:00 |
|
Mike Slemmer
|
96c16eb1e5
|
now oauth is working
|
2012-11-15 01:30:30 -08:00 |
|
Mike Slemmer
|
b4f0d3b9eb
|
another set of oauth work
|
2012-11-15 00:47:19 -08:00 |
|
Mike Slemmer
|
6b520b0a2b
|
facebook integration work
|
2012-11-14 22:18:37 -08:00 |
|
Mike Slemmer
|
436495b751
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-14 21:51:57 -08:00 |
|
Mike Slemmer
|
1e4e00962b
|
merge
|
2012-11-14 21:13:42 -08:00 |
|
Brian Smith
|
dd63b8e5ad
|
VRFS-89, VRFS-90 remove name from user model
|
2012-11-14 22:24:42 -05:00 |
|
Brian Smith
|
ecf792b404
|
VRFS-89, VRFS-90 remove name from user model
|
2012-11-14 22:24:30 -05:00 |
|
Brian Smith
|
12e72d8c5f
|
VRFS-89, VRFS-90 remove name from user model
|
2012-11-14 22:24:07 -05:00 |
|
Mike Slemmer
|
645db0dfc6
|
merged
|
2012-11-14 12:09:17 -08:00 |
|
Mike Slemmer
|
c938c2c768
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-14 12:08:36 -08:00 |
|
Seth Call
|
ea7f9339a4
|
* trying out the login/logout as singleton pats
|
2012-11-14 00:08:32 -06:00 |
|
Seth Call
|
0d3334a3b0
|
* VRFS-88 api/login done
|
2012-11-13 23:57:10 -06:00 |
|
Seth Call
|
2d856351d7
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-13 23:37:56 -06:00 |
|
Seth Call
|
bd41e615cf
|
* VRFS-88; login/logout APIs done
|
2012-11-13 23:37:50 -06: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 |
|
Seth Call
|
32c1f07bb7
|
* VRFS-88; had to mark the test user as 'email_confirmed'
|
2012-11-13 23:36:41 -06:00 |
|
Seth Call
|
cb861a4aeb
|
* adding jam-ruby gems into websocket-gateway gemfile for reasons I don't fully understand
|
2012-11-13 21:08:50 -06:00 |
|
Seth Call
|
d2f9a249c7
|
* adding jam-ruby gems into websocket-gateway gemfile for reasons I don't fully understand
|
2012-11-13 21:07:28 -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 |
|
Mike Slemmer
|
02155614df
|
merge fix, added file
|
2012-11-13 13:15:17 -08:00 |
|
Mike Slemmer
|
166e3f26f1
|
modified manifest
|
2012-11-13 13:14:48 -08:00 |
|
Mike Slemmer
|
1a81f6b58b
|
Added authorization
|
2012-11-12 23:40:06 -08:00 |
Jonathon Wilson
|
2fb617cab7
|
Search. (VRFS-75)
|
2012-11-12 21:16:43 -07:00 |
|
Seth Call
|
7982eec779
|
* adding signup VRFS-72
|
2012-11-12 22:15:27 -06:00 |
|
Seth Call
|
4b392f8cde
|
*show.rabl resolved
|
2012-11-12 21:14:23 -06:00 |
|
Seth Call
|
5309f46964
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-11-12 21:12:36 -06:00 |
|
Seth Call
|
e18ce24527
|
* VRFS-72 merge
|
2012-11-12 21:11:58 -06:00 |
|
Brian Smith
|
5f3ed69c8e
|
add account fields
|
2012-11-12 21:52:30 -05:00 |