seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
2,938 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

2938 Commits

Author SHA1 Message Date
Scott Comer 4153cfe3a1 users.locidispid must be bigint, too 2014-02-24 16:31:53 -06: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 a90b909ac3 * fixing account identity tests and search tests 2014-02-24 18:54:19 +00:00
Seth Call 002560a332 * fixing pending tests 2014-02-24 18:05:29 +00: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
Brian Smith ccee2e15b3 VRFS-1210 VRFS-1212 VRFS-1223 bug fixes 2014-02-24 01:10:09 -05:00
Brian Smith 1e75e2ffeb fix play button issue 2014-02-23 22:57:24 -05: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 b2718de7cf VRFS-1223 allow unauthenticated users to view hover bubbles but hide action buttons 2014-02-23 21:05:31 -05: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
Jonathan Kolyer 7ff4184731 VRFS-808 Added call to initAfterConnect from loggedIn(); added timeout to repeated attempts in case of missing WSG login ack 2014-02-23 23:49:53 +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
Jonathan Kolyer dc0ccd102d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 22:16:00 +00:00
Jonathan Kolyer 32cdd8ff43 VRFS-757 removed forgot password link 2014-02-23 22:15:45 +00:00
Anthony Davis ad35b92d2c VRFS-1218 2014-02-23 15:51:23 -06:00
Anthony Davis f51626ad1a Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	web/spec/features/recordings_spec.rb
 2014-02-23 15:49:29 -06:00
Brian Smith 15a3f71a62 fix test 2014-02-23 16:39:31 -05: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
Brian Smith c79c841b57 fix avatar url for session invitation popup notification 2014-02-23 13:31:18 -05:00
Brian Smith 89dd2e9254 fix JS syntax error in session landing 2014-02-23 13:29:40 -05:00
Brian Smith a8144d4b28 show user hover bubble in sidebar only if avatar or name is hovered, not the entire row 2014-02-23 08:19:29 -05:00
Brian Smith 6c4939239e VRFS-807 modeled after leave session dialog 2014-02-23 07:53:33 -05:00
Scott Comer b0dfa5501f data model for geoipblocks 2014-02-22 23:39:20 -06:00
Seth Call bab83c91c1 * oops. def didn't mean to leave that fake backend event in 2014-02-23 05:27:49 +00:00
Seth Call 7f08e42d33 * also put promptLeave = false if the session is already over 2014-02-23 05:21:36 +00:00
Seth Call 23af96adbe * also set promptLeave to false when BACKGROUND_MOVE indicated VRFS-846 2014-02-23 05:15:26 +00:00
Seth Call df36417551 * VRFS-846 is likely handled; but can't test on mac due to bugs; going to try windows shortly 2014-02-23 05:04:04 +00:00
Seth Call bc3d1a6231 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 04:41:49 +00:00
Seth Call f119007c86 * VRFS-1219 - don't show prompt if leaving session from the add audio gear dialog 2014-02-23 04:41:42 +00:00
Scott Comer 57d2dff00b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-22 22:00:44 -06:00
Scott Comer 74fc2f1b48 data model for jamisp table 2014-02-22 22:00:32 -06:00
Anthony Davis 4ef19e4356 VRFS-1218 DRYing it slightly, move toward VRFS-1214 2014-02-22 21:12:12 -06:00
Anthony Davis 1397c86daa VRFS-1218 fixing recordings specs that do a Leave Session 2014-02-22 21:03:27 -06:00
Seth Call de24ba15bc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 02:26:33 +00:00
Seth Call acf8f84624 VRFS-1172 - easydropdown plugin thinkns client has touch support... but it doesn't 2014-02-23 02:26:19 +00:00
Anthony Davis afa49f2a41 Merge remote-tracking branch 'origin/develop' into develop 2014-02-22 16:38:25 -06:00
Anthony Davis 6fa96365b1 Music Session spec failing on build server 2014-02-22 16:37:58 -06:00
Brian Smith 53ac75c0e7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-22 13:44:44 -05:00
Brian Smith a2307e16b7 VRFS-658 warn user when navigating away from session 2014-02-22 13:43:11 -05:00
Seth Call 2acecc5dea Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-22 17:34:26 +00:00
Seth Call f2e97625b4 * VRFS-729 - reset FTUE after Add new audio gear selected 2014-02-22 17:34:17 +00:00
Anthony Davis 22535ffbfb VRFS-457 - whacking F/C/N characters in sidebar 2014-02-22 11:02:14 -06:00
Seth Call 5c9a75b466 * pending out the one broken websocket test. 2014-02-22 15:27:04 +00:00