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

1575 Commits

Author SHA1 Message Date
Jonathan Kolyer afe8380280 VRFS-3936 had to tweak mobile recording uploads 2017-04-20 01:06:25 -07:00
Seth Call a1fd8c3d10 add cors for real 2017-04-14 14:34:18 -05:00
Jonathan Kolyer cd762dcd15 VRFS-3936 conflict fixed merging develop 2017-03-22 12:49:58 -07:00
Seth Call 2eaa59a6d4 guitarcenter tweaks and fix accept lesson on counter recurring 2017-03-22 07:39:06 -05:00
Jonathan Kolyer 368030eedc VRFS-3936 mobile_recording_upload 2017-03-16 17:22:54 -07:00
Jonathan Kolyer 7dcbadb75f VRFS-3936 mobile recording json saves 2017-03-16 11:23:30 -07:00
Seth Call 67facaec4a fix display of session time 2017-02-12 20:49:33 -06:00
Seth Call 1b8a6dd01b fix ios_placed_order 2017-02-05 22:07:08 -06:00
Seth Call cf553009bf jamtrack price change 2017-02-05 14:42:51 -06:00
Seth Call 1491e9026e fix teacher payment code 2017-01-17 21:22:49 -06:00
Seth Call fb70455829 mark_lesson added 2017-01-17 12:24:49 -06:00
Seth Call 575abf01e5 pin carrier wave in web 2017-01-06 06:43:38 -06:00
Seth Call 5e04f72d8e paypal support 2016-12-15 12:47:08 -06:00
Seth Call ffd0469f09 working recordings 2016-11-04 11:18:58 -05:00
Seth Call a8b181394c wip 2016-10-27 18:24:54 -05:00
Seth Call abf3c6f0f5 fix jamclass posa cards 2016-10-07 11:56:48 -05:00
Seth Call de8324e87d posa/retailer fixes 2016-10-07 09:55:16 -05:00
Seth Call 1652dabb53 fixes for retailer 2016-10-07 08:28:17 -05:00
Seth Call 2d1c4bc507 fix bug in signup plus posa claim 2016-10-02 22:26:47 -05:00
Seth Call 60543897d4 VRFS-4287 - retail partner program done 2016-10-02 21:51:34 -05:00
Seth Call 3117c7ed3e posa2wip 2016-09-26 21:56:12 -05:00
Seth Call bca4356e43 many school fixes 2016-09-09 09:06:02 -05:00
Seth Call 2173a8821d various fixes for emails for second ed program 2016-09-08 18:06:04 -05:00
Seth Call 222b9ea9c6 fix for montlies 2016-09-08 06:06:28 -05:00
Seth Call fd4d21ae78 school education working 2016-09-08 05:59:58 -05:00
Seth Call 5353b75c2e posa wip 2016-08-31 04:19:16 -05:00
Seth Call c5f7711850 VRFS-4189 - non free jamtrack support 2016-08-02 20:46:15 -05:00
Seth Call 510d157262 * upgrade to Rails 4 as well as support JjamBlaster 2016-07-17 10:16:27 -05:00
Seth Call 7083cf7477 VRFS-4249 - fix for stripe error handling in charge method 2016-07-09 20:48:22 -05:00
Seth Call e2ae17755a fix issue where complete lessons have messed up hover 2016-07-09 13:31:06 -05:00
Seth Call 10632c35c0 jamblaster bootstrapping 2016-07-09 06:06:54 -05:00
Seth Call 01736de147 recording API 2016-07-06 22:28:32 -05:00
Seth Call 116597cd67 Hello 2016-06-24 16:40:09 -05:00
Seth Call 48635fe669 Add JamBlasterKernel to allowed product types 2016-06-24 15:53:00 -05:00
Seth Call bd0dc40a4c initial version of jamblaster management page 2016-06-24 09:15:04 -05:00
Seth Call e95c7fe8e5 Working on Jazz imports Stockton Helbing 2016-06-17 20:59:58 -05:00
Seth Call 17322eab1d cohort reportin 2016-06-09 13:23:32 -05:00
Seth Call 7d182e6153 VRFS-4142 - more fixes after more testing (test drive packages) 2016-06-03 08:41:14 -05:00
Seth Call 8b8aa08ac0 VRFS-4142 - a few fixes for test drive packages 2016-06-03 08:06:47 -05:00
Seth Call 88ebada41c VRFS-4142 - test drive packaging feature 2016-06-02 23:32:09 -05:00
Seth Call d4aa3bef2b bunch of jamclass fixes 2016-06-02 09:04:56 -05:00
Seth Call 1abacf0ec6 Merge branch 'develop' into feature/packages 2016-05-31 19:43:52 -05:00
Seth Call 920d648a2b slew of jamclass fixes 2016-05-31 19:20:03 -05:00
Seth Call e449139b63 alpha the list of FTUE instruments VRFS-4172 2016-05-31 11:54:20 -05:00
Seth Call 8793c77033 ftue fixes VRFS-4171, VRFS-4172 2016-05-31 11:13:49 -05:00
Seth Call e8843bfd64 ready for release JamClass 2016-05-31 08:35:04 -05:00
Seth Call 55a53325dd slew of fixes for recurring sessions, canceling sessions, and minor UI issues 2016-05-30 16:43:55 -05:00
Seth Call 197313dfc9 VRFS-4158, VRFS-4159 - audio/notation attachments work better 2016-05-30 00:32:55 -05:00
Seth Call ad28d8d55d VRFS-4157 - don't wipe out sessions when considering scheduling 2016-05-29 22:30:33 -05:00
Seth Call f20d011e40 wip 2016-05-29 19:30:51 -05:00
Seth Call 3252d2cbd2 screenshots add to student anding page 2016-05-29 14:37:54 -05:00
Seth Call 4c199661bf VRFS-4128 - refactoring of UserMailer done, but more testing needed 2016-05-29 11:17:26 -05:00
Seth Call ae9249532b ACH payment consideration in teacher payments 2016-05-28 18:48:40 -05:00
Seth Call 5d68fe322a VRFS-4126 - update teacher rating/student ratig post session dialog 2016-05-27 21:33:26 -05:00
Seth Call b4bf6319fd VRFS-4145 - remove extra dollar sign 2016-05-27 13:35:33 -05:00
Seth Call 0a9078f94e fix display of missed in jam class screen 2016-05-26 20:32:58 -05:00
Seth Call ea049068e0 lesson fixes 2016-05-26 18:10:05 -05:00
Seth Call cc3576f70f attach notations, audio, and recordings done 2016-05-26 16:25:51 -05:00
Seth Call 9212804eae VRFS-4118 - pulse side box 2016-05-24 21:05:31 -05:00
Seth Call 61314002b2 fix cancel of lessons 2016-05-24 15:17:42 -05:00
Seth Call 0528f09e27 VRFS-4123 put disconnected msg above broadcast 2016-05-24 14:25:50 -05:00
Seth Call 0ff71ff551 VRFS-4117 - fixed up special case no show emails and post-testdrive emails 2016-05-24 11:45:04 -05:00
Seth Call 1528de57a4 clean up no bill email 2016-05-24 10:45:15 -05:00
Seth Call 4545b9b273 VRFS-4124 - use user-auth, not stripe_account_id 2016-05-24 10:14:53 -05:00
Seth Call 021dc47d89 VRFS-4113 - lesson analysis error dealt with 2016-05-23 15:55:28 -05:00
Seth Call e2073b49b9 user origin tracking VRFS-4072 2016-05-23 12:26:32 -05:00
Seth Call 3deaa205d5 dont allow accepting slots in the past 2016-05-20 22:13:39 -05:00
Seth Call f9aec0526d Fix bug where 2nd test drive wouldn't work 2016-05-20 15:33:44 -05:00
Seth Call 7a4be8292f fix more issues with recent changes 2016-05-20 14:31:05 -05:00
Seth Call 7737f0977e VRFS-4091 VRFS-4089 VRFS-4088 - test drive payment screen is correct now, student can always join session 2016-05-20 10:31:43 -05:00
Seth Call 87eb29da11 VRFS-4086 decline to cancel 2016-05-19 21:42:27 -05:00
Seth Call a8e367041e VRFS-4082 - weird flow issue fixed when confirming a lesson 2016-05-19 14:12:43 -05:00
Seth Call a4f7e28acc * get lesson booking screen cleaned up (better states at end) 2016-05-19 13:26:37 -05:00
Seth Call 5214f36fc9 VRFS-4060 - timezone finagling 2016-05-17 22:11:20 -05:00
Seth Call 9725667e2a VRFS-4058 - update search ordering for teachers 2016-05-17 21:35:09 -05:00
Seth Call 0c0e22df8c VRFS-4041 - side bubble for teacher help reach out 2016-05-17 20:29:56 -05:00
Seth Call 141736ad2f * add rating dialogs for teacher/students and have them pop at end of lesson, be accessible from teacher rating profile pgae, and also from link in email 2016-05-17 13:31:53 -05:00
Seth Call 92b2e13ee8 jamclass enabled 2016-05-16 11:39:20 -05:00
Seth Call 166647d112 VRFS-4074 - cloud uri/storage for jamblaster 2016-05-12 18:54:00 -05:00
Seth Call 94128e7115 * relax user id on charges 2016-05-12 17:41:25 -05:00
Seth Call cfb8e27850 VRFS-3967 - backend teacher/school code working. needs test and some more edge cases 2016-05-12 16:29:27 -05:00
Seth Call 309ebb4e5a VRFS-3965 - manage payment features for students 2016-05-11 16:03:55 -05:00
Seth Call 15d968dff5 VRFS-3964 - manage payment features for teacher 2016-05-10 21:10:24 -05:00
Seth Call fe16d513be session controller 2016-05-10 12:59:01 -05:00
Seth Call ef153ad4b7 make a school if user shows school interest 2016-05-09 21:32:34 -05:00
Seth Call 4f35d5ce0f VRFS-3896 - update email for store owners 2016-05-09 20:13:06 -05:00
Seth Call 6f9d39ef16 VRFS-4050 - countdown timer 2016-05-09 16:47:55 -05:00
Seth Call 30aec92512 VRFS-4070 - fix cha by fix PostPrecossorMixin 2016-05-07 21:17:19 -05:00
Seth Call 5ce780f03b Fix easydropdown oopsies 2016-05-07 13:45:02 -05:00
Seth Call e46a4b01cd 3 versions of test drive available now 2016-05-04 21:20:38 -05:00
Seth Call 2e7e4dccf9 teacher profile improvements 2016-04-30 22:12:25 -05:00
Seth Call dd84a3ebf7 remove influxdb as dependency to ruby project 2016-04-26 22:22:49 -05:00
Seth Call 5c246dc182 Update background image for JamClass VRFS-4018 2016-04-26 12:36:06 -05:00
Seth Call 5479e27216 VRFS-4037 - fix mailing problemg 2016-04-26 10:01:53 -05:00
Seth Call e27a3130c1 Fix positioning of school kudos 2016-04-26 06:58:14 -05:00
Seth Call fea26d82f5 VRFS-4037 - create a interested in school landing page 2016-04-25 22:01:15 -05:00
Seth Call 2835941834 * fix global chat 2016-04-25 11:00:59 -05:00
Seth Call a14b58f2fe Home screen and session create screen re-worked 2016-04-22 15:00:08 -05:00
Seth Call 5701e888a8 Updating lessons with barely working version 2016-04-21 09:23:29 -05:00
Seth Call d46e8ed874 * fix teacher signup page 2016-04-13 17:14:05 -05:00
Seth Call 399d010310 * lessons 90% done, but still mostly hidden 2016-04-05 21:23:15 -05:00
Seth Call 12d8310dc6 * update teacher dump admin page and add new URL 2016-03-25 12:08:23 -05:00
Seth Call c4f691b6d0 * teacher admin tweaks 2016-03-22 11:14:32 -05:00
Seth Call 378af99e14 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-03-21 21:42:24 -05:00
Seth Call 2e3f47e9b2 * student page 2016-03-21 16:37:13 -05:00
Seth Call 5c14d283ab * teacher profile pgae 2016-03-21 15:39:15 -05:00
Jonathan Kolyer bf59f4ac62 jtx ios batch purchase loading 2016-03-17 12:30:44 +00:00
Jonathan Kolyer 97f0d58f2e batch purchase loading 2016-03-16 23:14:43 +00:00
Jonathan Kolyer 3d9bc9f541 jamtracks ios performance 2016-03-16 21:11:10 +00:00
Seth Call 22ca511681 * add a bunch of traces for debugging VRFS-3986 2016-03-14 13:42:14 -05:00
Seth Call 0a3d1016a1 * VRFS-3973 - websocket gateway to allow jamblasters to connect with no connection info 2016-03-04 09:06:13 -06:00
Seth Call 8c805f0378 * VRFS-3973 - event into backend on session join/leave events 2016-03-03 16:08:01 -06:00
Seth Call 54cbfc69f0 * blacklist email feature 2016-03-01 13:49:58 -06:00
Seth Call 681b27a4b4 * VRFS-3968 - refine responses for jamblaster pairing API 2016-02-29 11:35:18 -06:00
Jonathan Kolyer 4c3c23606a VRFS-3957 fixed cryptic sql query bug in UserBlacklist#banned 2016-02-26 18:37:54 +00:00
Seth Call 9cc2ee4f4f * VRFS-3912 - more jamblaster tweaking 2016-02-18 11:22:50 -06:00
Seth Call 7f6b41d8b1 * jamblaster apis VRFS-3912 2016-02-18 06:12:28 -06:00
Jonathan Kolyer 95c534623e VRFS-3928 fixed bug on JamTrack.latestPurchase, handling null case 2016-02-12 11:13:42 +00:00
Jonathan Kolyer 04a7a9dea4 VRFS-3800 use constants for static strings 2016-02-09 15:17:52 +00:00
Seth Call 0aecf7345f * code review time\! 2016-02-09 15:17:52 +00:00
Jonathan Kolyer 7e32ffcdf8 VRFS-3800 save ios receipt json 2016-02-09 15:17:52 +00:00
Jonathan Kolyer fab38451cd VRFS-3800 go-right receipt validation 2016-02-09 15:17:52 +00:00
Jonathan Kolyer 8c6d553823 VRFS-3800 ios receipt validation 2016-02-09 15:17:52 +00:00
Seth Call e446c3ff44 * mark user as teacher better 2016-02-10 21:09:45 -06:00
Seth Call 1652aa4bd3 * VRFS-3922 - update ip blacklist/whitelist behavior to offer more admin flexibilyt 2016-02-09 12:58:54 -06:00
Seth Call 2e81bafb01 * try out chat blast with no inactivity. fix 5 instrument validation pain 2016-02-08 06:56:54 -06:00
Seth Call 853d359a7e * VRFS-3919 - teacher testdrive settings in on pricing profile 2016-02-06 17:32:20 -06:00
Seth Call ce6377377b * serial no set to nil if blank 2016-02-03 10:57:11 -06:00
Seth Call 599d26f883 * VRFS-3912 - apis for jamblaster pairing 2016-02-03 10:56:14 -06:00
Seth Call 48be48caf5 * ban downloaders on second download 2016-02-02 05:44:18 -06:00
Seth Call 2e95682b10 * wip 2016-02-01 14:14:06 -06:00
Seth Call 0f4be88677 * wip 2016-01-30 16:08:54 -06:00
Seth Call 641a553dcc merged teacher search 2016-01-28 13:55:17 -06:00
Seth Call e451c4be3d * ios purchase finalization 2016-01-28 11:31:57 -06:00
Seth Call 86ea959972 * fix padding issue 2016-01-18 18:41:53 -06:00
Seth Call ba6a7af851 * VRFS-3873 browser fingerprinting being tracked 2016-01-16 19:56:29 -06:00
Seth Call 37417708b3 * merged 2016-01-15 12:04:06 -06:00
Seth Call 0d49744a7a * teacher profile musician profile QA'ed some 2016-01-15 11:59:55 -06:00
Seth Call 7fe1824085 * fix review API 2016-01-14 12:45:55 -06:00
Seth Call 31e8d6a26c * reviews 2016-01-13 07:15:58 -06:00
Seth Call 48a54b812c * merged ratings 2016-01-12 21:06:23 -06:00
Seth Call 69c05a3e0a * reviews updated 2016-01-12 21:01:39 -06:00
Seth Call 14643531dc * working minus ratings 2016-01-12 20:37:00 -06:00
Seth Call c05c706455 * support news 2016-01-08 16:13:59 -06:00
Seth Call fc38c9ec50 * VRFS-3822 - allow follow me behavior and client nodes to get in 2016-01-07 06:52:27 -06:00
Seth Call 6344e14f7d * wip 2016-01-07 05:12:11 -06:00
Seth Call c5b8465012 * crash dum 2016-01-04 14:44:45 -06:00
Seth Call 4d41e2278d * screen emails 2016-01-04 13:42:11 -06:00
Seth Call 922cfc4540 * finish out crash notification 2016-01-04 11:28:10 -06:00
Seth Call 4ef76abcf9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-01-03 21:39:00 -06:00
Seth Call 70f22f8601 * track em 2016-01-03 21:38:30 -06:00
Jonathan Kolyer adecb8fc20 VRFS-3784 refactored free credit decrementing from sale into user for ios 2016-01-03 17:38:30 +00:00
Seth Call fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Jonathan Kolyer 5411a3bbf9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-26 02:49:30 +00:00
Jonathan Kolyer ce1e735750 VRFS-3784 use ILIKE for search on original_artist 2015-12-26 02:47:39 +00:00
Seth Call 7a8775cbf6 * allow null parts on instrument assignment 2015-12-19 21:21:59 -06:00
Seth Call b48ea1cc59 * more fixing logic for paris tracks 2015-12-18 15:32:40 -06:00
Seth Call 09483f219a * paris music importing locally, stats refinement 2015-12-14 15:05:23 -06:00
Jonathan Kolyer 153ed88a79 VRFS-3728 head call for ios app; mixdown checksum; simulate purchase 2015-12-11 20:02:09 +00:00
Seth Call 6314748225 * wip 2015-12-09 11:32:24 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -06:00
Seth Call 8e72a9833a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-04 09:29:04 -06:00
Seth Call 5049e3f813 * generate CSV and PDF for jamtracks 2015-12-04 08:32:18 -06:00
Jonathan Kolyer bcca86da8f VRFS-3728 merge 2015-12-04 05:29:04 +00:00
Jonathan Kolyer 53f7f29c06 VRFS-3728 ios client sync api tweaks 2015-12-04 05:26:26 +00:00
Seth Call 54a437d6e1 * VRFS-3725 - frontend support for click tracks and tap-in creation 2015-12-03 14:21:07 -06:00
Seth Call 4cb737761a * add download trakcer page 2015-12-02 16:53:09 -06:00
Seth Call c1402e2777 * VRFS-3757 - Fix jamtrack search bugs 2015-12-02 15:01:18 -06:00
Seth Call 819e87079e * click track import working 2015-11-30 21:21:27 -06:00
Seth Call e3b4b2324b * clicktrack support 2015-11-30 17:54:17 -06:00
Seth Call 7f0fd988ce * add gift card image 2015-11-30 05:07:47 -06:00
Seth Call 6f488d4692 * make nice display for admin 2015-11-29 14:30:34 -06:00
Seth Call bd02774db9 GiftCards are purchable 2015-11-29 13:58:10 -06:00
Seth Call 6d514c3df2 * api for marking purchase from ios 2015-11-28 19:38:39 -06:00
Jonathan Kolyer 50c3731dff VRFS-3728 check for purchases and mixes outside of ios 2015-11-25 03:47:22 +00:00
Seth Call c329912527 *remove AAC generation warning 2015-11-20 07:07:56 -06:00
Seth Call 51429e8b5a * import of timtracks working 2015-11-20 06:57:32 -06:00
Seth Call d3d2fbb210 * generate jmep automatically 2015-11-18 15:22:06 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Jonathan Kolyer fb9a7c01af VRFS-3681 develop branch merge tweaks 2015-11-08 23:02:18 +00:00
Jonathan Kolyer f41aced15f VRFS-3681 reverted changes for develop branch merge 2015-11-08 22:44:15 +00:00
Jonathan Kolyer 1bcee2e60c Merge branch 'develop' into feature/mobile 2015-11-01 02:28:10 +00:00
Jonathan Kolyer c27ed06455 VRFS-3681 add year and counter 2015-11-01 02:27:18 +00:00
Jonathan Kolyer 61e93b7d1d VRFS-3681 fixed artist pagination 2015-10-29 03:17:47 +00:00
Seth Call 9d8c46ca7c * sale line items 2015-10-28 08:10:03 -05:00
Seth Call fbc2e9498f * fix iphone/ipad actions, also stop doing popups anywhere 2015-10-26 16:03:43 -05:00
Jonathan Kolyer 1fe20d6c2b merging develop 2015-10-24 01:58:49 +00:00
Seth Call af1da5ead4 * add pointers to admin 2015-10-23 15:08:54 -05:00
Seth Call f002864a08 * most of VRFS-3674 (detect browser-based fraud) done 2015-10-23 14:42:51 -05:00
Seth Call 0c5dbe2c68 * VRFS-3647 - add search capability to jamtrack page, and VRFS-3676 - poke redeem users 2015-10-22 05:51:49 -05:00
Jonathan Kolyer 8e88e7fe7e Merge branch 'develop' into feature/mobile 2015-10-22 09:02:42 +00:00
Jonathan Kolyer 8e21fb1fe7 merging develop 2015-10-22 01:00:34 +00:00
Seth Call 27328a7c65 * VRFS-3670 - affiliate rate usage 2015-10-20 21:09:58 -05:00
Jonathan Kolyer ffa5fe1798 Merge branch 'develop' into feature/mobile 2015-10-20 00:40:05 +00:00
Seth Call 9dbcdb2436 * help doc tweak 2015-10-19 17:53:50 -05:00
Jonathan Kolyer 7a2dd6ea0b VRFS-3459 merging develop 2015-10-19 19:58:41 +00:00
Seth Call 5073c2d4e7 * show daily status 2015-10-19 14:34:06 -05:00
Seth Call a63f9085f4 * VRFS-3664 - dont say dear anonymous in emails 2015-10-19 10:07:53 -05:00
Seth Call e7f8e2fed1 * fix nil crash in importer, and make referral page display friendlier 2015-10-18 09:05:24 -05:00
Seth Call d2d1b8facc * anonymous check is correct now, as well as video in landing page 2015-10-16 16:50:08 -05:00