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

429 Commits

Author SHA1 Message Date
Seth Call d63d3ba1b2 * wip 2015-07-10 10:49:48 -05:00
Seth Call 3eea6c89d5 Merge branch 'develop' into feature/new_session 
Conflicts:
	web/app/assets/javascripts/fakeJamClient.js
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/trackHelpers.js
	web/app/assets/javascripts/utils.js
	web/app/views/dialogs/_dialogs.html.haml
 2015-07-08 12:34:06 -05:00
Seth Call 08ccda245e * wip 2015-07-06 14:23:33 -05:00
Seth Call 43d0ee7916 * wip 2015-07-03 08:17:03 -05:00
Seth Call 4be1117a02 * wip 2015-06-26 13:03:32 -05:00
Seth Call 910b052204 *wip 2015-06-20 08:56:52 -05:00
Seth Call 7a803bb682 * wip 2015-06-17 19:03:01 -05:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Seth Call 2cb01d8492 * VRFS-3268 - make bugsnag and recurly async 2015-05-29 21:33:45 -05:00
Seth Call 43b92d4a17 * VRFS-3264 - help bubbles on jamtrack browse screen when not logged in, VRFS-3267 help IE11 visualize jamtrack browse page correctly 2015-05-29 15:30:23 -05:00
Seth Call 54a7cb40c9 * turn timing off, and track with GA 2015-05-28 11:10:50 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -05:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -05:00
Seth Call 781a9838b7 * VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260 2015-05-18 10:33:58 -05:00
Seth Call f5595a03d5 * actually send email when fraud detected 2015-05-16 10:18:35 -05:00
Seth Call a62aaeef11 * VRFS-3260 - fraud check allowed in tests 2015-05-15 23:50:27 -05:00
Seth Call 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -05:00
Seth Call 939f8cdf82 * VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests 2015-05-15 12:34:35 -05:00
Steven Miers 193888f960 VRFS-3242 : Merge with latest develop 2015-05-13 20:56:58 -05:00
Seth Call 2723cd8a78 * VRFS-3215 - add checkoutComplete URL 2015-05-12 14:14:44 -05:00
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Seth Call 4709622546 * VRFS-2680 - adding redirect logic for ssl 2015-05-11 16:52:58 -05:00
Seth Call 8c04a601ab * add required websocket configs 2015-05-11 09:50:45 -05:00
Seth Call 62b6820e90 * VRFS-3220 - estimate taxes manually 2015-05-09 08:30:12 -05:00
Seth Call 10da152916 * VRFS-3225 - show sampler ate dropdown 2015-05-08 15:03:19 -05:00
Seth Call 840d2169b1 * remove puts/debug settings 2015-05-07 09:03:24 -05:00
Seth Call 0ea2931837 * add config to remove whitespace from credit card number. probably unnecessary; just doing now before release 2015-05-07 09:02:58 -05:00
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Seth Call f593a6d706 VRFS-3208 - let admins purchase anyway when pucrhase_nabled = false 2015-05-07 07:45:07 -05:00
Seth Call b523850296 * VRFS-3208 - add new config - purchases_enabled, so that we can stop purchases if needed 2015-05-06 22:09:07 -05:00
Seth Call a2d5c0a2b9 * VRFS-3166 - only play one widget at a time 2015-05-04 07:52:30 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Seth Call 1cd57cb4e8 * VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates 2015-05-01 12:09:18 -05:00
Steven Miers 51dc0c408a Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-30 19:33:04 -05:00
Seth Call 68b4ab529a * VRFS-3118 - reload audio globally configurable 2015-04-29 22:03:02 -05:00
Steven Miers daef55d1a2 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-29 12:59:11 -05:00
Seth Call 72ff54213a * VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch 2015-04-28 20:07:21 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 1bd054d050 * VRFS-3094 - update style and minor issues in shopping cart screen 2015-04-27 15:42:38 -05:00
Seth Call 13c3818c42 * add support for personal alerts email 2015-04-24 16:16:47 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Seth Call 989518fa68 * VRFS-3082 - email alert if jamtrack fails 2015-04-23 10:34:17 -05:00
Seth Call d66f8e50d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 15:47:57 -05:00
Seth Call 091f2be556 * make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues 2015-04-22 15:43:36 -05:00
Steven Miers b916d4d997 VRFS-3055 : Multiple levels of config option video_available 
“none”, “mvp”, and “full”.  “mvp” mode is similar to full, except it
hides video recording functionality.
 2015-04-22 15:36:21 -05:00
Seth Call 763ade01dd * protect against webcamViewer from getting involved if video is not available 2015-04-22 10:18:33 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00