Scott Comer
|
1e8d2bb724
|
update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff
|
2014-03-02 23:16:48 -06:00 |
|
Scott Comer
|
284cbeefc4
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-01 23:37:00 -06:00 |
|
Scott Comer
|
a64ab23c97
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-01 20:37:15 -06:00 |
|
Scott Comer
|
5d899f57dd
|
complete unit tests for api_scoring_controller and add some better test data
|
2014-03-01 20:36:51 -06:00 |
Brian Smith
|
37745101e2
|
add comment explaining sort
|
2014-03-01 21:35:11 -05:00 |
 Seth Call
|
b7a1e06889
|
* working on generic recording widget logic
|
2014-02-28 19:28:17 +00:00 |
|
Seth Call
|
51f955fc74
|
* VRFS-1047 - broadcast widget almost fully done
|
2014-02-28 00:24:55 +00:00 |
|
Seth Call
|
fd584967f2
|
Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-27 18:38:12 +00:00 |
|
Seth Call
|
aaef11add4
|
* VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only
|
2014-02-27 18:38:02 +00:00 |
|
Scott Comer
|
fd42fc56fe
|
wire up get_work
|
2014-02-27 10:42:47 -06:00 |
|
Brian Smith
|
09899e8f0a
|
VRFS-1247 include Listen link in session emails
|
2014-02-27 00:00:01 -05:00 |
|
Brian Smith
|
e9e3cd886f
|
VRFS-1246 revert some emails back to use to field
|
2014-02-26 21:15:40 -05:00 |
|
Brian Smith
|
4588149876
|
VRFS-1246 bcc users on generated emails
|
2014-02-26 20:56:58 -05:00 |
|
Brian Smith
|
ca20570a16
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-26 20:56:33 -05:00 |
|
Seth Call
|
7c99c44eaf
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-27 00:38:06 +00:00 |
|
Seth Call
|
f0e916e736
|
* VRFS-1047 - looks good; no audio hooked up
|
2014-02-27 00:38:01 +00:00 |
|
Scott Comer
|
2a66b1ec6d
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 23:02:06 -06:00 |
|
Scott Comer
|
d12e65549d
|
wire up api/scoring/record
|
2014-02-25 23:01:55 -06:00 |
|
Brian Smith
|
ee0a25293d
|
VRFS-1235 de-dup tracks on recording hover
|
2014-02-25 22:04:19 -05:00 |
|
Brian Smith
|
2794a03993
|
VRFS-1231 de-dup instruments for the same musician
|
2014-02-25 20:36:45 -05:00 |
|
Seth Call
|
45c61ad038
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 19:27:47 +00:00 |
|
Seth Call
|
7a41b74549
|
* VRFS-1228
|
2014-02-25 19:22:32 +00:00 |
|
Scott Comer
|
4e24b51fe9
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 08:32:13 -06:00 |
|
Brian Smith
|
1322f72e64
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 07:23:10 -05:00 |
|
Scott Comer
|
2163e0172f
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 06:17:58 -06:00 |
|
Seth Call
|
686a0980e6
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 05:41:47 +00:00 |
|
Seth Call
|
7753a2d4b3
|
* VRFS-1228 - can add, but not update ,user biography
|
2014-02-25 05:41:43 +00:00 |
|
Brian Smith
|
e9e57c71de
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 00:37:13 -05:00 |
|
Brian Smith
|
a873ab29e7
|
VRFS-1231 fix user/track display on landing pages
|
2014-02-25 00:36:53 -05:00 |
Jonathan Kolyer
|
b36e87e29f
|
VRFS-733 disabled validation fail when sessions exist until tests can pass
|
2014-02-25 04:25:22 +00:00 |
|
Scott Comer
|
39b209dfc3
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-24 21:51:11 -06:00 |
|
Scott Comer
|
8d72f48915
|
get_work data model
|
2014-02-24 21:50:58 -06:00 |
|
Jonathan Kolyer
|
9d3ee833a1
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-25 03:29:38 +00:00 |
|
Seth Call
|
051fcd8b04
|
* working around conn.update
|
2014-02-25 03:25:34 +00:00 |
|
Scott Comer
|
b33206683b
|
merged updates
|
2014-02-24 15:22:26 -06:00 |
|
Scott Comer
|
f69cdc3b4d
|
fix problem with locidispid being int instead of bigint; add scores; flush use of prepared statements for geoip stuff; implement connection manager update of connection and user records with location information
|
2014-02-24 15:19:46 -06:00 |
|
Seth Call
|
e4718652fd
|
* merging
|
2014-02-24 16:57:01 +00:00 |
|
Seth Call
|
0522c20e60
|
* VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock
|
2014-02-24 16:55:56 +00:00 |
|
Brian Smith
|
31c7cf7b45
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-24 01:10:20 -05:00 |
|
Jonathan Kolyer
|
fe5163b1fb
|
added active class accessor
|
2014-02-24 04:24:13 +00:00 |
|
Scott Comer
|
7de74f89af
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-23 21:42:23 -06:00 |
|
Brian Smith
|
69b4342731
|
remove puts statements
|
2014-02-23 21:04:02 -05:00 |
|
Jonathan Kolyer
|
4b91f4493c
|
VRFS-773 added validation check to ensure users cannot connect to multiple music sessions unless they are admin
|
2014-02-24 01:46:38 +00:00 |
|
Scott Comer
|
810b5e7911
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-23 17:24:40 -06:00 |
|
Scott Comer
|
04dab677f9
|
model for geoiplocations
|
2014-02-23 17:24:25 -06:00 |
|
Brian Smith
|
83b4260b91
|
VRFS-759 VRFS-1221 delete session notifications when session ends in db and sidebar, fix listen button for sessions and recordings
|
2014-02-23 15:47:53 -05:00 |
|
Brian Smith
|
0a2da28ae4
|
VRFS-1215 must call deliver to send emails
|
2014-02-23 14:08:28 -05:00 |
|
Brian Smith
|
f318558c4b
|
VRFS-1215 fix UserMailer so templates are loaded correctly
|
2014-02-23 13:32:03 -05:00 |
|
Scott Comer
|
b0dfa5501f
|
data model for geoipblocks
|
2014-02-22 23:39:20 -06:00 |
|
Scott Comer
|
74fc2f1b48
|
data model for jamisp table
|
2014-02-22 22:00:32 -06:00 |