Brian Smith
|
964e7bbd1c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-30 09:40:54 -05:00 |
|
Brian Smith
|
946cf7c8d0
|
VRFS-159 fixed bugs / added unit tests
|
2012-12-30 09:39:59 -05:00 |
|
Brian Smith
|
2c4e550910
|
VRFS-159 fixed bugs / added unit tests
|
2012-12-30 09:39:41 -05:00 |
|
Brian Smith
|
2550fb40b5
|
remove friend_requests constraint to allow friend requests with same source/target users
|
2012-12-30 09:34:15 -05:00 |
 Seth Call
|
6968f22f8c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-29 10:12:48 -06:00 |
|
Seth Call
|
e2cb402704
|
* VRFS-188 in progress
|
2012-12-29 10:12:05 -06:00 |
|
Brian Smith
|
a4b8421609
|
fix unit test
|
2012-12-29 09:32:13 -05:00 |
|
Brian Smith
|
a60fb64512
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-29 09:30:10 -05:00 |
|
Brian Smith
|
dec0aa7e52
|
VRFS-159 block, spam, ignore friend requests / unit tests
|
2012-12-29 09:29:20 -05:00 |
|
Brian Smith
|
80a5a5d7f3
|
VRFS-159 block, spam, ignore friend requests / unit tests
|
2012-12-29 09:28:41 -05:00 |
|
Brian Smith
|
fe6680a7d9
|
VRFS-159 block, spam, ignore friend requests / unit tests
|
2012-12-29 09:28:19 -05:00 |
|
Seth Call
|
c576bada56
|
* fake commit to test bitbucket integration with jenkins
|
2012-12-28 14:15:12 -06:00 |
Mike Slemmer
|
8ce22c153d
|
Completing password reset
|
2012-12-27 23:31:12 -08:00 |
|
Mike Slemmer
|
9b443f08f7
|
Completing password reset
|
2012-12-27 23:30:03 -08:00 |
|
Mike Slemmer
|
bec5bb4729
|
fix tests
|
2012-12-21 22:32:24 -08:00 |
|
Mike Slemmer
|
9db67b98c8
|
fix test
|
2012-12-21 21:35:45 -08:00 |
|
Mike Slemmer
|
eed2ae8a1f
|
reset password work
|
2012-12-21 16:56:49 -08:00 |
|
Mike Slemmer
|
a5f6bc725a
|
reset password work
|
2012-12-21 16:56:16 -08:00 |
|
Mike Slemmer
|
93a02251ad
|
switch to timestamp
|
2012-12-21 12:01:47 -08:00 |
|
Mike Slemmer
|
cb625d17ab
|
make naming clearer
|
2012-12-21 11:51:25 -08:00 |
|
Mike Slemmer
|
a8a59abdd5
|
Reset password schema
|
2012-12-21 11:50:21 -08:00 |
|
Brian Smith
|
db2f16c471
|
refactor
|
2012-12-17 02:02:20 -05:00 |
|
Brian Smith
|
ba120d40e9
|
refactor
|
2012-12-17 01:58:50 -05:00 |
|
Brian Smith
|
4f5c8df2bf
|
VRFS-174 - added resource to retrieve bands for a specific user
|
2012-12-17 01:24:23 -05:00 |
|
Brian Smith
|
b4b6ee190e
|
VRFS-120 - completed Likes for Users and Bands
|
2012-12-17 01:02:09 -05:00 |
|
Brian Smith
|
45600115f7
|
VRFS-120 - completed Likes for Users and Bands
|
2012-12-17 01:01:48 -05:00 |
|
Brian Smith
|
009d538ede
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-16 18:24:39 -05:00 |
|
Brian Smith
|
e7f46015d0
|
VRFS-120 - Likes module
|
2012-12-16 18:24:35 -05:00 |
|
Brian Smith
|
9ca701d99e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-12-16 18:24:23 -05:00 |
|
Brian Smith
|
37d24a0c0e
|
VRFS-120 - Likes module
|
2012-12-16 18:24:14 -05:00 |
Jonathon Wilson
|
5932be249a
|
Add FTUE screens to create Session cucumber feature
|
2012-12-16 15:52:17 -07:00 |
|
Mike Slemmer
|
ef6b0d5ef1
|
merge
|
2012-12-16 12:40:31 -08:00 |
|
Mike Slemmer
|
dea34e1b91
|
Merge branch 'master' into slemmer_20121211
|
2012-12-16 12:27:20 -08:00 |
|
Mike Slemmer
|
090a81ce8c
|
work on updating music sessions plus testing create and update
|
2012-12-16 12:26:29 -08:00 |
|
Jonathon Wilson
|
dff47dae00
|
Merge branch 'vrfs-173_ftue'
|
2012-12-16 12:30:09 -07:00 |
|
Jonathon Wilson
|
ba0111be60
|
Add GetASIOAudioDevices to testBridge page. Update other nav headers.
|
2012-12-16 12:28:10 -07:00 |
|
Brian Smith
|
d411ff14d6
|
track updates
|
2012-12-16 10:53:48 -05:00 |
|
Brian Smith
|
5e0004f854
|
removed connection_track model
|
2012-12-16 08:28:07 -05:00 |
|
Brian Smith
|
cd3883b13c
|
fixed bug with track creation / added unit test
|
2012-12-16 08:25:38 -05:00 |
|
Jonathon Wilson
|
449de26da0
|
Default to FTUE for now. Enable back/forward nav buttons.
|
2012-12-15 14:00:02 -07:00 |
|
Mike Slemmer
|
6768472528
|
regions and cities requests plus tests
|
2012-12-15 12:17:41 -08:00 |
|
Brian Smith
|
cf9c21148e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-15 02:12:17 -05:00 |
|
Brian Smith
|
97dd557854
|
VRFS-157 track API development
|
2012-12-15 02:11:04 -05:00 |
|
Brian Smith
|
3d2bfe5f4f
|
VRFS-157 track API development
|
2012-12-15 02:10:42 -05:00 |
|
Brian Smith
|
9357d3f03a
|
VRFS-157 track API development
|
2012-12-15 02:10:01 -05:00 |
|
Mike Slemmer
|
de941eaef1
|
duh
|
2012-12-14 21:51:59 -08:00 |
|
Seth Call
|
6e30ef81d1
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-14 21:37:07 -06:00 |
|
Seth Call
|
5aa85eb408
|
* VRFS-17; now having other join session
|
2012-12-14 21:36:53 -06:00 |
|
Seth Call
|
e7def85594
|
* VRFS-17; can create a session, find the other; not joining yet
|
2012-12-14 21:22:00 -06:00 |
|
Mike Slemmer
|
2a63593726
|
Merge branch 'master' into slemmer_20121211
|
2012-12-14 12:31:21 -08:00 |