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,876 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

4171 Commits

Author SHA1 Message Date
Jonathan Kolyer cbfb8f35c1 VRFS-3936 using Recording.create_immediately 2017-02-24 15:32:02 -08:00
Jonathan Kolyer 81979ba4bb VRFS-3936 merging develop 2017-02-24 14:05:57 -08:00
Seth Call fdd046e15f allow ios through 2017-02-13 07:21:36 -06:00
Seth Call 9ad22b35ae cancel fix 2017-02-12 21:13:31 -06:00
Seth Call f80c8014dd fix bad chat history 2017-02-12 20:56:41 -06:00
Seth Call 67facaec4a fix display of session time 2017-02-12 20:49:33 -06:00
Seth Call a79b44a88c remove 403 check from jamblaster 2017-02-12 10:52:06 -06:00
Seth Call cf553009bf jamtrack price change 2017-02-05 14:42:51 -06:00
Seth Call 063cbd27ee allow multiple users to control same jb 2017-01-29 21:41:33 -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 19b2edcefa fix URI encode of download of JT from ap 2017-01-05 21:21:30 -06:00
Seth Call 4a702b46fd fix URI encode of download of JT from ap 2017-01-05 21:15:03 -06:00
Seth Call ea7ed8c65e fix 2016-12-19 17:09:17 -06:00
Seth Call c43b6cb1b9 allow serialno pinning of jamblaster artifacts 2016-12-18 22:23:05 -06:00
Seth Call edcd297092 fix paypal gem reference 2016-12-17 11:08:26 -06:00
Seth Call a4eea05a84 hello 2016-12-17 08:02:55 -06:00
Seth Call 6b878cf119 try to pin coffeescriptsource 2016-12-15 20:57:08 -06:00
Seth Call 5e04f72d8e paypal support 2016-12-15 12:47:08 -06:00
Seth Call 458637b1de VRFS-3993 - better nav/help on jamtrack player 2016-12-06 08:01:10 -06:00
Seth Call 7ea80fa26f default to default samplerate 2016-12-05 09:00:49 -06:00
Seth Call 80145a09da Merge branch 'feature/jbmvp' into develop 2016-11-04 11:19:14 -05:00
Seth Call ffd0469f09 working recordings 2016-11-04 11:18:58 -05:00
Seth Call 1bfdba6ca4 seo 2016-11-01 20:27:32 -05:00
Seth Call d58330d8da add 2 simple static landing pages 2016-10-27 20:28:21 -05:00
Seth Call a8b181394c wip 2016-10-27 18:24:54 -05:00
Jonathan Kolyer cd843f300c VRFS-3936 merging develop 2016-10-08 19:08:17 +00: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 60543897d4 VRFS-4287 - retail partner program done 2016-10-02 21:51:34 -05:00
Seth Call 345007f110 merged 2016-09-27 15:39:45 -05:00
Seth Call 9bdc4bb394 fix for missing checkboxs 2016-09-26 22:01:07 -05:00
Seth Call 3117c7ed3e posa2wip 2016-09-26 21:56:12 -05:00
Seth Call eb89ea0a43 better education interest screen 2016-09-23 08:24:42 -05:00
Seth Call 8760924e59 fix for jamtrack open twice bug 2016-09-13 04:36:18 -05:00
Seth Call 493ac18650 re-open jamtrack 2016-09-12 22:25:13 -05:00
Seth Call 57b1bebf44 VRFS-4306 - more improvements for second ed 2016-09-09 13:17:46 -05:00
Seth Call e0f470fdcc fix space issue 2016-09-09 10:04:55 -05:00
Seth Call bbe6b50489 workaround for lack of rabl behavior 2016-09-09 09:56:13 -05:00
Seth Call b781902f7d many more school fixes 2016-09-09 09:53:38 -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 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 d32cecaa03 fix typo 2016-07-19 07:30:41 -05:00
Seth Call 834d308647 stop having browsers say that they are a jamblaster, and also fix icheck assets 2016-07-18 20:58:43 -05:00
Seth Call 0aba92650c remove is jamblaster check for now 2016-07-18 18:09:01 -05:00
Seth Call cb35f75dcc non-stupid assets 2016-07-17 21:56:29 -05:00
Seth Call 510d157262 * upgrade to Rails 4 as well as support JjamBlaster 2016-07-17 10:16:27 -05:00
Seth Call 61368ae20d lessons.rake fix 2016-07-12 21:26:08 -05:00
Seth Call 23300f22a2 fix recurring lessons 2016-07-11 21:38:08 -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 611420e9c4 more completed elesson hover improvements 2016-07-09 13:51:44 -05:00
Seth Call e2ae17755a fix issue where complete lessons have messed up hover 2016-07-09 13:31:06 -05:00
Seth Call cdd78f1b94 jamblaster bootstrap 2016-07-09 06:20:42 -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 9ad5a97733 return 2016-06-24 17:14:38 -05:00
Seth Call 116597cd67 Hello 2016-06-24 16:40:09 -05:00
Seth Call 526b11e0d1 fix for bug 2016-06-24 15:25:36 -05:00
Seth Call 0f9c02f5f1 initial cut at jamblaster managemente config 2016-06-24 13:42:54 -05:00
Seth Call bd0dc40a4c initial version of jamblaster management page 2016-06-24 09:15:04 -05:00
Jonathan Kolyer 8592894f7a Merge branch 'develop' into VRFS-3936 2016-06-19 22:10:30 +00:00
Jonathan Kolyer ce4dfa4261 VRFS-3936 recording api 2016-06-18 13:57:39 +00:00
Seth Call e95c7fe8e5 Working on Jazz imports Stockton Helbing 2016-06-17 20:59:58 -05:00
Seth Call 9db218d518 VRFS-4193 - pop open system browser for Stripe Connect when in app 2016-06-03 10:14:29 -05:00
Seth Call c6b11e64ad VRFS-4142 - works with logged in user 2016-06-03 09:45:11 -05:00
Seth Call d2f478395e VRFS-4142 - fix indentation issue 2016-06-03 08:46:42 -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 ece81a2c9b yellow-ify link 2016-06-02 09:40:07 -05:00
Seth Call d4aa3bef2b bunch of jamclass fixes 2016-06-02 09:04:56 -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 c6a5321601 VRFS-4160 - add checkbox styling and pop external in recording selector dialog 2016-05-29 22:50:57 -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 01a096d6c3 VRFS-4151 - checkboxes fixed on search screen 2016-05-29 20:17:18 -05:00
Seth Call d30b5326bc get dark image up 2016-05-29 19:31:19 -05:00
Seth Call 3252d2cbd2 screenshots add to student anding page 2016-05-29 14:37:54 -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 9d160bfd7c VRFS-4125 - icheckbox ify teacher profile page 2016-05-27 16:23:58 -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 5939079a89 fix bug with connection manager disconnect 2016-05-25 15:26:45 -05:00
Seth Call 9212804eae VRFS-4118 - pulse side box 2016-05-24 21:05:31 -05:00
Seth Call bc63407bb7 VRFS-4127 - clean up msuh after disconnect 2016-05-24 17:31:14 -05:00
Seth Call 6ab4775f96 let join now link stay for duration of lesson 2016-05-24 15:19:11 -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 af897048ad lesson actions fix 2016-05-24 13:02:14 -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 2dafc8288a VRFS-4115 - update text of student dialog 2016-05-23 14:54:19 -05:00
Seth Call 1944832c96 VRFS-4112 login redirect on client/ signin 2016-05-23 14:49:24 -05:00
Seth Call f8c88dc225 VRFS-4111 lesson coming up soon has time data 2016-05-23 13:51:58 -05:00
Seth Call 8ad0e3ca14 VRFS-4109 - remove teach 2016-05-23 13:24:20 -05:00
Seth Call fd85736a32 VRFS-4110 - Shouldn't offer TestDrive lesson to student who already took one from this teacher 2016-05-23 13:22:26 -05:00
Seth Call e2073b49b9 user origin tracking VRFS-4072 2016-05-23 12:26:32 -05:00
Seth Call a3c4b12b50 VRFS-4107 - fake break removed 2016-05-22 12:08:04 -05:00
Seth Call 2c6e3cac92 VRFS-4107 - more tweaks to jamclass student page 2016-05-22 08:29:59 -05:00
Seth Call f9cecdd0f0 VRFS-4108 fix links on www for jamclass 2016-05-21 15:34:48 -05:00
Seth Call 2ba3655191 VRFS-4108 - student landing page updates 2016-05-21 15:18:34 -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 6652808f86 VRFS-4087 implement cancel button on booking screen 2016-05-19 21:49:54 -05:00
Seth Call 87eb29da11 VRFS-4086 decline to cancel 2016-05-19 21:42:27 -05:00
Seth Call cdadc8bff4 VRFS-4083 - switched sender name in email 2016-05-19 14:45:26 -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 397be9ab14 VRFS-4066 VRFS-4044 bugs fixed 2016-05-18 23:03:22 -05:00
Seth Call 94397136d3 search options url fix for VRFS-4062 2016-05-18 20:49:57 -05:00
Seth Call e458d65a12 VRFS-4062 - search teacher button goes to correct search page 2016-05-18 20:49:33 -05:00
Seth Call b8ba4eb7f9 more refinement for timer on jamclass screen 2016-05-18 20:43:07 -05:00
Seth Call a9e346ffb3 VRFS-4061 - Implement more obvious way to join a lesson when it's time to join 2016-05-18 15:18:38 -05:00
Seth Call f9429f8712 VRFS-4094 - clip avatar name if too long 2016-05-17 21:05:47 -05:00
Seth Call 0690e30a32 add a little border to phone call-to-action 2016-05-17 20:59:14 -05:00
Seth Call fb0c96e6b4 VRFS-4052 - more connectstripe form defaults 2016-05-17 20:52:25 -05:00
Seth Call 0c0e22df8c VRFS-4041 - side bubble for teacher help reach out 2016-05-17 20:29:56 -05:00
Seth Call 22bd49b16b * fix for URI rewrite 2016-05-17 13:34:14 -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 5d82f555c5 Fix query 2016-05-12 20:13:25 -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 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 0d564b1b83 take up full width 2016-05-09 16:57:36 -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 abf34bcd5d VRFS-4049 jamclass menu UI cleaned up 2016-05-05 07:59:18 -05:00
Seth Call e46a4b01cd 3 versions of test drive available now 2016-05-04 21:20:38 -05:00
Seth Call 0d8341c2d8 * bring back bubbles 2016-05-01 20:35:51 -05:00
Seth Call 2c51334966 teacher profile improvements 2016-04-30 22:12:45 -05:00
Seth Call 2e7e4dccf9 teacher profile improvements 2016-04-30 22:12:25 -05:00
Seth Call 4abc2f81ff Remove influxdb dependency from other projects 2016-04-27 05:46:35 -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 b0ac61fbea VRFS-4037 - no title wrap 2016-04-26 10:06:02 -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 f8c62631f6 Fix bad dialog when you have test drive already 2016-04-25 10:15:23 -05:00
Seth Call 56cfe11e19 Removing some text from teacher landing page 2016-04-25 08:14:54 -05:00
Seth Call 872bcd2582 Better tests 2016-04-25 08:09:00 -05:00
Seth Call a14b58f2fe Home screen and session create screen re-worked 2016-04-22 15:00:08 -05:00
Seth Call b13ffe2d32 Refresh user after booking 2016-04-21 15:29:40 -05:00
Seth Call 71df46a6ca Fix bad test drive count on booking page and add nav 2016-04-21 10:51:04 -05:00
Seth Call a4a869535e * force pg_migrate version- 2016-04-21 09:51:28 -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 e07bc21d2a * cause dependency added 2016-04-13 12:38:32 -05:00
Seth Call fc465a1b68 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-04-13 12:07:37 -05:00
Seth Call 10c3571cd8 * make network test optional, add help for no audio 2016-04-13 12:05:04 -05:00
Jonathan Kolyer f8ee7b693d VRFS-3855 use :head param to emulate head request through get 2016-04-10 21:22:52 +00:00
Seth Call 90c167fb91 * disable influx 2016-04-06 13:35:38 -05:00
Seth Call 9e4105a391 * VRFS-4004 and VRFS-4005 - student/teacher welcome emails 2016-04-06 13:01:40 -05:00
Seth Call adf0274b73 * fixes for some tests, and also some broken functionality in the school maangement page 2016-04-06 07:06:52 -05:00
Seth Call 399d010310 * lessons 90% done, but still mostly hidden 2016-04-05 21:23:15 -05:00
Seth Call 40df9eed6f * better error reporting for bad connections on join session 2016-03-29 05:50:14 -05:00
Seth Call 12d8310dc6 * update teacher dump admin page and add new URL 2016-03-25 12:08:23 -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 b3e2943599 * fix minor drumma boy import issues 2016-03-16 10:10:23 -05:00
Seth Call dbf4ae777b * support for drumma boy storage jamtracks 2016-03-13 16:46:09 -05:00
Seth Call df4c0fba26 * sessionId fix 2016-03-11 08:00:17 -06:00
Seth Call 72e3ed165b * move to session screen 2016-03-10 23:03:41 -06:00
Seth Call 2cc7a3646b * pin reflux 2016-03-10 16:09:46 -06:00
Seth Call bc80fd1325 fix minor issue 2016-03-10 14:58:26 -06:00
Seth Call 349e9027a3 * try different way of referencing broadcast actions 2016-03-10 14:57:14 -06:00
Seth Call 2ad2531f6b * a little debugging info 2016-03-10 13:10:13 -06:00
Seth Call 98d29965a0 * pass back in username and also leave/join 2016-03-10 08:10:43 -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 f6652fa180 * dont use email blacklist ban 2016-03-01 14:24:31 -06:00
Seth Call 54cbfc69f0 * blacklist email feature 2016-03-01 13:49:58 -06:00
Seth Call 51977c7cc3 * VRFS-3968 - remove puts 2016-02-29 11:36:34 -06:00
Seth Call 681b27a4b4 * VRFS-3968 - refine responses for jamblaster pairing API 2016-02-29 11:35:18 -06:00
Seth Call 78c00604f3 * jamblaster user API VRFS-3918 2016-02-26 09:04:00 -06:00
Seth Call 39a240551a * more font sizin 2016-02-24 21:27:56 -06:00
Seth Call 0cc2aca908 * bump up sizes 2016-02-24 06:56:58 -06:00
Seth Call 18a92e4cc1 * iphone/mobile optimzation of landing pagse 2016-02-23 15:48:55 -06:00
Seth Call 8942ed4ccf * itunes links 2016-02-23 05:55:15 -06:00
Seth Call 0cd19e6725 * update jmep logic 2016-02-22 20:05:44 -06:00
Seth Call f225a85484 * remove puts 2016-02-18 11:47:08 -06: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
Seth Call 534b4f0e6c * duh. backwards logic 2016-02-09 15:17:52 +00:00
Seth Call 0aecf7345f * code review time\! 2016-02-09 15:17:52 +00:00
Jonathan Kolyer b8a190c889 VRFS-3800 removed comment 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 1da6749d70 * allow BACK button to work even if invalid state VRFS-3924 2016-02-09 10:14:37 -06:00
Seth Call d7ddff9bb7 * fix validation 2016-02-08 20:47:01 -06:00
Seth Call 01aae26e80 * chat help 2016-02-08 16:48:12 -06:00
Seth Call d62526d087 * update teacher landing page to work at all 2016-02-08 16:42:08 -06:00
Seth Call dfa423a1a3 * check jamblaster serial no better 2016-02-08 12:33:39 -06:00
Seth Call 1467b2b0e7 * disconnect working again VRFS-3454 2016-02-08 11:45:11 -06:00
Seth Call eb8e330073 * limit total msgs 2016-02-08 11:31:33 -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 7fc4376236 * VRFS-3914 - update jamblaster serial no if present 2016-02-03 11:18:47 -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 c8179ccbcc Merge branch 'feature/global_chat' into develop 2016-02-01 14:16:46 -06:00
Seth Call 2e95682b10 * wip 2016-02-01 14:14:06 -06:00
Seth Call 8900af5196 * wip 2016-01-31 08:01:33 -06:00
Seth Call 5bd36e3731 * fix feed 2016-01-30 16:09:17 -06:00
Seth Call 0f4be88677 * wip 2016-01-30 16:08:54 -06:00
Seth Call 9e9c2819dd * update how click track is determined for jamtracks 2016-01-29 17:37:28 -06:00
Seth Call 641a553dcc merged teacher search 2016-01-28 13:55:17 -06:00
Seth Call 50e2090f25 * slowley beefing up chat 2016-01-28 13:34:59 -06:00
Seth Call e451c4be3d * ios purchase finalization 2016-01-28 11:31:57 -06:00
Seth Call 3243abf837 * started at now set on jamtrack sessions 2016-01-28 06:28:56 -06:00
Seth Call a7dfe55d3c * custom error when opening free JamTrack when email not verified 2016-01-25 20:25:30 -06:00
Seth Call 8638cdda92 * VRFS-2035 allow static port config in UI 2016-01-25 10:29:27 -06:00
Seth Call 8138f11701 * JamClass teacher landing page VRFS-3872 2016-01-21 11:49:40 -06:00
Seth Call 5a0259aa54 * VRFS-3865 - initial version of jam class student landing page 2016-01-21 06:14:13 -06:00
Seth Call d93f64c2e5 * fix easy dropdown silliness 2016-01-20 05:37:13 -06:00
Seth Call 4d8b8a38b6 * VRF-3880 many teacher profile fixes 2016-01-19 21:54:55 -06:00
Seth Call 86ea959972 * fix padding issue 2016-01-18 18:41:53 -06:00
Seth Call 491bc8cda5 * fix null mark by specifying client = true 2016-01-16 20:54:22 -06:00
Seth Call 1154a83dae * dump and correction of download tracker 2016-01-16 20:37:44 -06:00
Seth Call ba6a7af851 * VRFS-3873 browser fingerprinting being tracked 2016-01-16 19:56:29 -06:00
Seth Call 01405618ae * more styling of profile 2016-01-16 12:44:04 -06:00
Seth Call 7adfb3a6b9 * part way through size testing of profile 2016-01-16 12:12:15 -06:00
Seth Call 4e63b2e1d8 * more button alignment 2016-01-15 20:49:13 -06:00
Seth Call ca246fc95e * music profile styling tweaks 2016-01-15 20:44:37 -06:00
Seth Call 35839c1b4d * fix alignment/scroll issues on samples page 2016-01-15 20:18:58 -06:00
Seth Call e14484164f * fix hugely empty dialog 2016-01-15 14:55:49 -06:00
Seth Call 5e7ba5bd8a * fix tile bug and validate bug 2016-01-15 14:51:22 -06:00
Seth Call e40442af15 * hide bogus profiles on profile page 2016-01-15 13:21:51 -06:00
Seth Call c2f4cd0c56 * correct search on filter 2016-01-15 12:39:43 -06:00
Seth Call 33b02c0f55 * add jamtrack linkability for artist 2016-01-15 12:35:04 -06:00
Seth Call d7e949885d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-01-15 12:04:21 -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 88afc1c272 * reviews working 2016-01-14 15:33:23 -06:00
Seth Call 1869ee021d * reviews displaying 2016-01-14 15:23:11 -06:00
Seth Call cb422a498f * fix weird alignment issue with search button 2016-01-14 20:14:13 +00:00
Seth Call b9dd872be0 * fix issue where search bar doesn't show for users with over 20 jamtracks 2016-01-14 12:54:59 -06:00
Seth Call 7fe1824085 * fix review API 2016-01-14 12:45:55 -06:00
Seth Call e3b6c7b894 * crash dump reporting with date 2016-01-14 07:27:08 -06:00
Seth Call 9dfb04613d * fix scroll issues with front page 2016-01-14 06:52:18 -06:00
Seth Call e22218b163 * olark added VRFS-3853 2016-01-14 04:49:02 -06:00
Seth Call 5773ba6e57 * autofollow behavior 2016-01-13 08:04:02 -06:00
Seth Call 40c260b2ba * make other participnat show 2016-01-13 07:44:33 -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 14643531dc * working minus ratings 2016-01-12 20:37:00 -06:00
Seth Call 1764a3e306 fix signin link text 2016-01-09 03:37:20 +00:00
Seth Call d136401529 * update nav to scroll 2016-01-08 21:26:12 -06:00
Seth Call 48bd7ae2da * wip 2016-01-08 20:59:18 -06:00
Seth Call 57550d292e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-01-08 17:32:25 -06:00
Seth Call fcf4a0b566 * fix some more ui issues on home page 2016-01-08 17:32:19 -06:00
Seth Call 7a7d7c0829 * wip 2016-01-08 17:29:58 -06:00
Seth Call 77abf33332 fix url to jamtracks 2016-01-08 23:27:04 +00:00
Seth Call 40de0ef04f * precompile modern 2016-01-08 16:46:50 -06:00
Seth Call c05c706455 * support news 2016-01-08 16:13:59 -06:00
Seth Call 96ffaedb1a * homepage 2016-01-08 15:40:10 -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 427bcd6e56 * treat risky users differently 2016-01-04 20:44:14 -06:00
Seth Call 521eac693d * wip 2016-01-04 20:02:20 -06:00
Seth Call 3a95b22762 * add specific configs for sendgrid 2016-01-04 17:37:41 -06:00
Seth Call 0b8a792af7 * wip 2016-01-04 17:25:29 -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 7ca4de12d7 * email alert 2016-01-03 22:13:01 -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
Seth Call 718668b5d2 * alert on USB 1.1 being too old 2015-12-30 14:23:24 -06:00
Jonathan Kolyer 8d28efde62 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-30 18:07:31 +00:00
Jonathan Kolyer e76ab54738 VRFS-3784 added user.id to login json response 2015-12-30 18:07:03 +00:00
Seth Call 00f69ecc01 fix user sync check 2015-12-29 14:28:04 -06:00
Seth Call b20f79af3f * fix sync bug 2015-12-29 11:37:06 -06:00
Seth Call 18be9f69a1 * width of p important 2015-12-29 11:02:43 -06:00
Seth Call 712f1c90f3 * update arrow 2015-12-29 11:02:10 -06:00
Seth Call e558554324 * wip 2015-12-29 10:59:37 -06:00
Seth Call afa4ff3182 JamBlaster product page finalization 2015-12-28 22:23:16 -06:00
Seth Call 0416ad01f1 * hover over vst instead of click, and fix placement of midi help link 2015-12-28 12:43:50 -06:00
Seth Call 0fcdb708fc * working on basic 2015-12-28 10:43:14 -06:00
Seth Call fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Seth Call d62655cbd2 * update resync audio 2015-12-28 05:32:54 -06:00
Seth Call 565544f357 * VRFS-3814 - update jamblaster product page for post-KS 2015-12-28 04:57:15 -06:00
Seth Call f7ec3df32d * bring back scan help, and pass in vst type ID based on win vs mac 2015-12-27 10:11:22 -06:00
Seth Call 89b48619a6 * working on new jamblaster landing page 2015-12-27 10:03:56 -06:00
Seth Call 4208391c44 * reload if trying to load while loading due to howler bug 2015-12-24 21:28:04 -06:00
Seth Call a23703fb09 * remove extra print 2015-12-23 12:37:10 -06:00
Seth Call def24616f3 * VRFS-3816 - tell user VST enable is coming in session 2015-12-23 12:35:57 -06:00
Seth Call 5ee54adc7c * VRFS-3815 - select instrument before device requirement fixed for midi 2015-12-23 11:36:05 -06:00
Seth Call a1774320ce * fix show of midi track 2015-12-23 11:31:10 -06:00
Seth Call 133cc2806a * fix update track while in session 2015-12-23 09:51:43 -06:00
Seth Call 0305369944 * midi working for the most part 2015-12-22 21:28:19 -06:00
Seth Call 1908d82012 * always show help 2015-12-22 09:34:40 -06:00
Seth Call 8d69a804e8 * fix up initial scan info 2015-12-22 09:32:22 -06:00
Seth Call 39d72e83bb * no scan done unless user asks. scan paths 2015-12-21 16:42:18 -06:00
Jonathan Kolyer 474f147892 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-19 05:35:43 +00:00
Seth Call 3aadfaaedb * strip out whitespace from csv 2015-12-18 15:57:27 -06:00
Seth Call b48ea1cc59 * more fixing logic for paris tracks 2015-12-18 15:32:40 -06:00
Seth Call ff6f133620 * import fixes for Paris 2015-12-18 11:35:56 -06:00
Jonathan Kolyer d6500449da VRFS-3784 added layout for jamtracks app viewing of corp pages 2015-12-17 20:32:37 +00:00
Seth Call 8c7c345859 * fix importer 2015-12-15 11:26:58 -06:00
Seth Call fc84b2657a * update bandwidth notice 2015-12-14 15:21:14 -06:00
Seth Call 09483f219a * paris music importing locally, stats refinement 2015-12-14 15:05:23 -06:00
Seth Call 11a8ee55f0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-11 21:24:58 -06:00
Seth Call 3707a3abd6 * stats working decently 2015-12-11 21:14:00 -06:00
Jonathan Kolyer 48f85fecfa VRFS-3728 comment 2015-12-11 20:02:09 +00: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 37929de36e * fix bad coffeescript syntax 2015-12-11 07:02:37 -06:00
Seth Call 03d71b0678 * disable midi via config 2015-12-11 06:45:30 -06:00
Seth Call f69aadbe20 * get rid of print 2015-12-10 22:20:28 -06:00
Seth Call f82f64f2db Merge branch 'feature/stats' into develop 2015-12-10 22:09:44 -06:00
Seth Call 8e73c5bb80 * stats and vst together 2015-12-10 22:07:56 -06:00
Seth Call b07aedc9cc * merged 2015-12-10 20:54:09 -06:00
Seth Call 0376b206cf * stats workip 2015-12-10 20:52:13 -06:00
Seth Call 3388ec14db * stats wip 2015-12-10 05:21:59 -06:00
Seth Call 69363e6fd6 * revert back how free jamtracks are made 2015-12-09 12:02:22 -06:00
Seth Call 6314748225 * wip 2015-12-09 11:32:24 -06:00
Seth Call 34dcc27641 Merge branch 'develop' into feature/vst 2015-12-07 21:05:10 -06:00
Seth Call 9afc3155ef * remove log 2015-12-07 21:05:05 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -06:00
Seth Call 6d5db83aea * midi not working still 2015-12-04 15:29:59 -06:00
Seth Call dd8e375766 * scan weirdness 2015-12-04 12:08:40 -06:00
Seth Call d9f1becb9b * merge 2015-12-04 11:37:59 -06:00
Seth Call 949ce8a513 * VRFS-3756 - webcam audio 2015-12-04 11:16:40 -06:00
Seth Call 223988f421 * better align 2015-12-04 09:39:33 -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 3adeef4dee * csv/pdf links in place in the UI 2015-12-04 09:27:28 -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 e3b4b2324b * clicktrack support 2015-11-30 17:54:17 -06:00
Seth Call b7cbb86e3b * tweak gift card landing 2015-11-30 11:03:32 -06:00
Seth Call 7f0fd988ce * add gift card image 2015-11-30 05:07:47 -06:00
Seth Call 7432b50438 * fix some minor display issues 2015-11-29 14:15:53 -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 5e754a7096 * update video Url 2015-11-24 07:45:17 -06:00
Seth Call b9a7bd6e09 * fix JS error 2015-11-24 06:49:35 -06:00
Seth Call becf0a82b1 * updatin landing pages for JamBlaster on Kickstarter 2015-11-24 06:03:23 -06:00
Seth Call 143506afd5 * wip 2015-11-21 15:29:15 -06:00
Seth Call 83b7009c51 * wip 2015-11-20 16:18:08 -06:00
Seth Call 51429e8b5a * import of timtracks working 2015-11-20 06:57:32 -06:00
Seth Call 184bf2ba4d * merge 2015-11-19 22:09:11 -06:00
Seth Call c2772398a8 * importer 2015-11-19 22:07:38 -06:00
Seth Call 1da8cfd4a1 * support abort signal 2015-11-19 16:58:55 -06:00
Seth Call 2a74d7ec9a * record crash dump description 2015-11-19 11:22:41 -06:00
Seth Call d3d2fbb210 * generate jmep automatically 2015-11-18 15:22:06 -06:00
Seth Call d4cdab8d6b * VRFS-3715 - filepicker fixed by taking out signature and policy 2015-11-17 06:26:37 -06:00
Seth Call cd6bf55a1a * VRFS-3719 - dont show update dialog more than one at a time 2015-11-17 05:28:02 -06:00
Seth Call 38a64a3dde * VRFS-3711 - push video button brings to front 2015-11-16 20:46:44 -06:00
Seth Call bec9388aae * vst fixems 2015-11-13 15:35:13 -06:00
Seth Call 5fad4953bc * vst working 2015-11-13 14:00:37 -06:00
Seth Call 021db62539 Merge branch 'develop' into feature/vst 2015-11-13 11:06:07 -06:00
Seth Call e8cb399692 * fix some tests 2015-11-13 10:00:46 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Seth Call c3626ebe22 * wip 2015-11-11 05:39:28 -06:00
Seth Call bb9beb9cab Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-11-09 15:33:14 -06:00
Seth Call 1da8c73721 * wip 2015-11-09 15:33:04 -06:00
Jonathan Kolyer 9df947097f VRFS-3681 develop branch merge review 2015-11-08 23:05:34 +00:00
Jonathan Kolyer f41aced15f VRFS-3681 reverted changes for develop branch merge 2015-11-08 22:44:15 +00:00
Jonathan Kolyer 57314a9b1c VRFS-3681 reverting edits prior to develop branch merge 2015-11-08 22:24:31 +00:00
Jonathan Kolyer d7a6bdaaba VRFS-3681 mobile load preview image 2015-11-08 22:15:01 +00:00
Jonathan Kolyer 70f047dd3c VRFS-3681 removed git merge artifcats 2015-11-08 22:06:19 +00:00
Seth Call 99cd31ea78 * whitespace change 2015-11-01 16:22:43 -06:00
Seth Call 022fd60b3c * wip 2015-11-01 06:39:51 -06:00
Jonathan Kolyer 958bb9346e Merge branch 'feature/mobile' of bitbucket.org:jamkazam/jam-cloud into feature/mobile 2015-11-01 02:32:55 +00:00
Jonathan Kolyer 1bcee2e60c Merge branch 'develop' into feature/mobile 2015-11-01 02:28:10 +00:00
Seth Call f7267d38c6 * wip 2015-10-30 09:59:50 -05:00
Seth Call a84f344335 * disable resizing 2015-10-27 13:06:33 -05:00
Seth Call 68d165427c * bump 2015-10-27 12:11:40 -05:00
Seth Call 806308ac01 * bump from top 2015-10-27 09:51:39 -05:00
Seth Call 86d33c0f79 * create mix not working; fixed 2015-10-27 09:48:07 -05:00
Seth Call 8d026a3fdb * fix bug with stemId downoad 2015-10-27 09:20:37 -05:00
Seth Call 52524c774d * wip 2015-10-27 09:19:14 -05:00
Seth Call b686020b49 * wip 2015-10-26 20:20:26 -05:00
Seth Call d52f6b570a * add scroll and my mixes on by default 2015-10-26 16:49:55 -05:00
Seth Call fbc2e9498f * fix iphone/ipad actions, also stop doing popups anywhere 2015-10-26 16:03:43 -05:00
Seth Call 73a04d4d95 * typo added in video_upload 2015-10-24 05:13:33 -05:00
Jonathan Kolyer 1fe20d6c2b merging develop 2015-10-24 01:58:49 +00:00
Jonathan Kolyer 2a0e733b84 VRFS-3672 adding :duration 2015-10-24 01:57:35 +00:00
Seth Call f002864a08 * most of VRFS-3674 (detect browser-based fraud) done 2015-10-23 14:42:51 -05:00
Seth Call 150c5da5b3 * remove rails react img 2015-10-23 07:52:33 -05:00
Seth Call b2fca8cc0b * VRFS-2818 - control both master/personal mix for volume/mute controls of media tracks 2015-10-22 11:08:34 -05:00
Seth Call 95ec9ce66e * VRFS-3667 - put download buttons in client app view 2015-10-22 09:04:49 -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 d3d9a2db49 * VRFS-3668 - show download errors in popup player, VRFS-3659 - cache tracks in popup player 2015-10-21 10:44:02 -05:00
Seth Call f086ff74c3 * fix how player occurs in native client 2015-10-21 08:36:41 -05:00
Jonathan Kolyer ffa5fe1798 Merge branch 'develop' into feature/mobile 2015-10-20 00:40:05 +00:00
Jonathan Kolyer 93d11d6b3b VRFS-3459 removed errand git merge inserts 2015-10-20 00:38:46 +00:00
Seth Call 9dbcdb2436 * help doc tweak 2015-10-19 17:53:50 -05:00
Seth Call 93e0be7bdd * bump 2015-10-19 15:40:55 -05:00
Jonathan Kolyer bfa3b0b8c9 VRFS-3459 accidental file adding 2015-10-19 20:00:09 +00:00
Jonathan Kolyer 7a2dd6ea0b VRFS-3459 merging develop 2015-10-19 19:58:41 +00:00
Seth Call 53f5c6d4df * fix help doc link 2015-10-19 13:54:33 -05:00
Seth Call 515704898c * make player list not be dynamic, and fix context.stats write 2015-10-19 13:42:39 -05:00
Seth Call f0ece5f894 * allow custom mixes to be made even if full jamtrack not selected 2015-10-19 13:04:17 -05:00
Seth Call 993e12995c * track redeem correctly; also try and fix admin 2015-10-19 12:56:52 -05:00
Seth Call fa586d878d * force width to be 450 VRFS-3663 2015-10-19 09:44:58 -05:00
Seth Call 813e8b2fbe * VRFS-3665 - move download icon to the right of folder icon 2015-10-19 08:24:09 -05:00
Seth Call 1ecb17d2a7 * only need params affiliate to be present 2015-10-17 06:30:45 -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
Seth Call 9a8aeced51 * VRFS-3660 - fix issue with jamtrack tile page not refreshing when user buys free jamtrack 2015-10-16 15:59:29 -05:00
Seth Call 801504be2b * fixing bug when referencing name instead of first/last for feed 2015-10-16 14:56:54 -05:00
Seth Call 7d5edc298d * updated video links for JamTracks 2015-10-16 14:26:23 -05:00
Seth Call 58b8a29f51 * VRFS-3630 - jamtrack landing page revamp 
* VRFS-3637 - jamtrack landing tile updated
* VRFS-3638 - jamtrack web player
 2015-10-16 14:01:18 -05:00
Seth Call 55007e9619 * use closure to caputer video true/false 2015-10-15 11:16:12 -05:00
Seth Call e01634285a * make sure upload to youtube popup is only shown for video dialogs 2015-10-15 06:10:21 -05:00
Seth Call 29f3b52120 * VRFS-3651 - dont show upload to youtube checkbox for audio sessions 2015-10-15 06:03:03 -05:00
Jonathan Kolyer c700f856e5 Merge branch 'develop' into feature/mobile 2015-10-13 17:34:12 +00:00
Jonathan Kolyer 538f7e75a1 VRFS-3459 added :year, :plan_code 2015-10-13 17:31:15 +00:00
Seth Call 2d54b03a07 * VRFS-3633 - fix metronome visualization in popup 2015-10-09 07:20:29 -05:00
Seth Call 70b3a2f5de * translate enum ids into framerates for start video recording - VRFS-3631 2015-10-09 06:37:18 -05:00
Seth Call eba43cf228 * translate enum ids into framerates for start video recording - VRFS-3631 2015-10-09 06:32:53 -05:00
Seth Call 6ecf591520 * VRFS-3629 - deal with upload failure correctly 2015-10-08 15:07:51 -05:00
Seth Call c3097d4436 * VRFS-3625 - tell backend correctly abot keeping video if user discards, and filter out recordingId of video 2015-10-08 12:18:18 -05:00
Seth Call 4bdf555409 * make height of google prompt bigger because we ask for more 2015-10-08 11:45:18 -05:00
Seth Call aa51114e8a * deal with no refresh token better 2015-10-08 11:36:16 -05:00
Seth Call 276442a9b4 * VRFS-3512 - upload videos to youtube 2015-10-07 21:12:26 -05:00
Steven Miers 8f20da7567 VRFS-3359 : Currency field behavior 
* Formats on blur only
* Render pulls currency value from local cache if field has focus
* Save to cache on initial focus, even if not changed
 2015-10-05 15:37:54 -05:00
Jonathan Kolyer 0c25d0e40b merging develop 2015-10-05 14:06:39 +00:00
Jonathan Kolyer 47def5113b VRFS-3459 config.middleware.use Rack::Deflater 2015-10-03 03:20:25 +00:00
Jonathan Kolyer 09432cea1c VRFS-3459 tweaks for mobile mixdowns 2015-10-03 03:19:56 +00:00
Seth Call 4290d449ed * default to full avail 2015-09-30 12:26:24 -05:00
Seth Call 9abee035be * VRFS-3513 - start/stop video possible from frontentd 2015-09-30 11:26:03 -05:00
Seth Call cb76a6e28f * VRFS-3588 generating AAC's for master previews 2015-09-29 19:57:31 -05:00
Seth Call c0d78c9d26 * VRFS-3586 up 40 from 20 for the jamtrack account screen 2015-09-26 14:01:51 -05:00
Seth Call 8e67d6d9b8 * fix help alignment 2015-09-25 13:28:48 -05:00
Seth Call aaa450f14e * add help article link to popup for JamTracks 2015-09-25 10:53:53 -05:00
Seth Call 3fdf835942 * hide custom mix controls when custom mix is active 2015-09-25 08:36:25 -05:00
Seth Call 5018be71dd * fix sample rate issue typo in keys.rabl 2015-09-23 18:30:38 -05:00
Seth Call a5e4c2dfce * VRFS-3519 - prevent play click when JamTrack is loading 2015-09-23 15:27:41 -05:00
Seth Call 49dc6890fc * VRFS-3579 - dont try to kick off 2 downloads 2015-09-23 14:39:34 -05:00
Seth Call 0aa2f215b6 * VRFS-3580 - empty windows shouldn't show 2015-09-23 13:57:14 -05:00
Seth Call 6c5c4731ed * VRFS-3577 - hide open media controls while JamTrack mixdown is downloading 2015-09-23 12:03:40 -05:00
Seth Call c379c6dc44 * VRFS-3576 - deal with case that mixdown is not yet created 2015-09-23 10:38:38 -05:00
Seth Call 284e671b01 * VRFS-3571 - fixes to temp ban user if they are spamming server 2015-09-23 09:18:00 -05:00
Seth Call 0f9b1c3f07 * don't find against notifications for a blank notify 2015-09-22 21:34:34 -05:00
Seth Call 1dce984247 * VRFS-3519 - 2-player sessions working with custom mix 2015-09-22 15:25:48 -05:00
Seth Call a0feb09509 * check in missing images 2015-09-22 05:48:00 -05:00
Seth Call de9856b5be * pin back react-select 2015-09-21 21:11:01 -05:00
Seth Call d3ca53672b * remove react_rails_img 2015-09-21 20:30:51 -05:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -05:00
Steven Miers ae854d858f VRFS-3359 : Fix several errors related to syntax, property usage, etc. 2015-09-21 13:00:06 -05:00
Jonathan Kolyer 5534ec0224 VRFS-3459 mixdown merging 2015-09-21 01:00:38 +00:00
Jonathan Kolyer 5c0178df8f VRFS-3393 jam_track has_many genres support 2015-09-21 01:00:37 +00:00
Jonathan Kolyer 4b01097c97 VRFS-3393 register api--first draft 2015-09-21 01:00:37 +00:00
Jonathan Kolyer dd420527c0 VRFS-3398 fixing queries, api integration 2015-09-21 01:00:37 +00:00
Jonathan Kolyer af662fa714 VRFS-3389 jamtrack search 2015-09-21 01:00:37 +00:00
Jonathan Kolyer 10d4d99953 VRFS-3389 fetch genres/instrumnets only with jamtracks; initial search impl 2015-09-21 01:00:37 +00:00
Seth Call 077b5a700d * allow jamblaster to fetch http 2015-09-21 01:00:37 +00:00
Seth Call 468b0c4998 * adding guess code and fixing importer 2015-09-20 15:14:45 -05:00
Steven Miers b3b3e46dc9 VRFS-3359 : Fix page not loading due to input tag formatting 2015-09-19 18:37:33 -05:00
Steven Miers 2e4dfaa728 Squashed commit of the following: 
commit 30965c6351
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 15 05:23:27 2015 -0500

    * allow jamblaster to fetch http

commit 5c8fb6b01e
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:43:07 2015 -0500

    * don't issue stop video in session end

commit 3e27680ea9
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:40:34 2015 -0500

    * decommision webcam_viewer in session page

commit ac1cc0c828
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Sep 10 07:24:42 2015 -0500

    * VRFS-3541 - don't use HTML to store data sent to server for genre
ID bug in profile

commit 004991119a
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 15:10:51 2015 -0500

    * set 'are you our user' cookie to do better job with ad tracking

commit 13a950e65f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:58:46 2015 -0500

    * align disable vide obutton better

commit 9722c6cbc6
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:45:18 2015 -0500

    * whitesapce

commit 3976707b14
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:13:51 2015 -0500

    * check for video enabled better

commit b483dd537f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:02:12 2015 -0500

    * better text for video test

commit a4f465b6d1
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 20:30:47 2015 -0500

    * VRFS-3530, VRFS-3531 - allow user to test and disable video

commit ba99f88048
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 10:05:26 2015 -0500

    * VRFS-3534 - fix start recording API signature

commit 386ed8144c
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Sep 6 19:03:08 2015 -0500

    * VRFS-3528 - make sure open jamtrack dialog passes
'show_purchased_only'

commit 6d010a561b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 20:43:15 2015 -0500

    * deal with too-few tracks on landing page, and the 3rd CTA bubble
clipping off text

commit 0076f0205a
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 15:00:45 2015 -0500

    * VRFS-352 - instrument-centric landing page

commit 3ee71634b3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 2 09:40:06 2015 -0500

    * remove test stuff

commit d07ac009bf
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 1 08:11:35 2015 -0500

    * VRFS-3509 - case where no device is configured handled

commit 9420cebad4
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Aug 30 05:00:00 2015 -0500

    * VRFS-3494 - show popup when video window launches for the 1st
time to offer guidance

commit c3f81a4d23
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 10:35:43 2015 -0500

    * build bump

commit e782d5f9bb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 09:43:40 2015 -0500

    * VRFS-3419 - check better for window opener

commit 36b6699cde
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 08:12:47 2015 -0500

    * validate popup VRFS-3419

commit 8948f0498f
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 07:59:21 2015 -0500

    * fix changed path

commit 2bce35d604
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:38:34 2015 -0500

    * fix jamtrack test

commit 63ef63c20d
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:34:40 2015 -0500

    * fix typo again in webcamViewer. need to go to bed

commit 8566cc5bc9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:31:34 2015 -0500

    * fix typo added in webcamViewer

commit 22ea6e89fd
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:26:39 2015 -0500

    * VRFS-3488 - jamtrack search by artist and song need to pin to the
match, not do a sloppy search

commit a4bd28e168
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 16:43:34 2015 -0500

     VRFS-3474 - watch for USB events and refresh video pages

commit d2edfd22c5
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 12:01:52 2015 -0500

    * VRFS-3467 - previews are 20 seconds long indicator on jamtracks

commit defdfa8ce9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 06:04:53 2015 -0500

    * VRFS-3473 - fix 'videoShared' state in webcamViewer

commit 090cfa17c0
Merge: 7560b34 818596a
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:53:35 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 7560b340c7
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:52:05 2015 -0500

    * VRFS-3466 - updated frontend to pass in GUIDs

commit 1252dbe178
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 05:28:15 2015 -0500

    * use new bridge calls to handle current FPS and resolution
VRFS-3428

commit 818596ae36
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Tue Aug 25 08:23:52 2015 +0000

    VRFS-3451 musician_search verifying instrument and genres inputs

commit 6918eaf095
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 17:55:06 2015 -0500

     more UI tweaks for video settup in account screen VRFS-3428

commit fc69242578
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:18:31 2015 -0500

    * VRFS-3427 - update FTUE to test video, not just audio

commit 729974013a
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:17:53 2015 -0500

    * VRFS-3428 - fix button text

commit db1f1d60d5
Merge: 04825d2 90c8d05
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:56:42 2015 -0500

    Merge branch 'feature/video_frontend' into develop

commit 04825d2659
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:54:59 2015 -0500

    * VRFS-3428 - update how we query backend for frame rates

commit 39d0731d74
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:44:59 2015 -0500

    * VRFS-3456 - remove special chars from search

commit 1874720ee8
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:32:28 2015 -0500

    * VRFS-3456 - protect special chars from tsquery

commit 29104ff09b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Aug 21 05:02:48 2015 -0500

    * VRFS-3446 - bug fix for no genre specified on join of session;
also fix search bar in jamtrack dialog

commit 3b6d1febdb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:44:21 2015 -0500

    * forget cta image

commit 6ac622853c
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:02:55 2015 -0500

    * VRFS-3449 - a little more tweaking of JamTrack landing page

commit d7fcadcd0d
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:49:07 2015 -0500

    * VRFS-3450 - fix 'show all tracks' when pagination occurs by not
doubleregistering

commit e7b50ca4a8
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:19:07 2015 -0500

    * VRFS-3449 - updates for direct landing pages

commit 0d075a9568
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:19:17 2015 -0500

    * fix spacing issue

commit 9c17d9a024
Merge: 9873450 0b67ef5
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:48 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 98734506df
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:36 2015 -0500

    * VRFS-3448 - fix invisible downloader

commit 90c8d05d00
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 14:17:10 2015 -0500

    * wip

commit bf4044d92e
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 09:24:14 2015 -0500

    * VRFS-3422 - don't die if the user has on sale_line_items

commit 87c62b4db2
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 08:29:22 2015 -0500

    * a fix for linux? hfa code

commit 3fa58715fc
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:36:04 2015 -0500

    * fix open jamtrack dialog for people with less than 10 jamtracks

commit d045c94f54
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:17:37 2015 -0500

    * more HFA request polish

commit dc343f10e3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:01:47 2015 -0500

    * don't show free jamtrack notice on landing page if
redeemed_jamtrack cookie is set

commit e6618da456
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 21:29:15 2015 -0500

    * fix a bug in figuring out if the user should be show GET IT FREE

commit 5ba03a2755
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 20:41:37 2015 -0500

    * VRFS-3431 - better response when creating HFA request

commit 37d6c3e57c
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 15:19:40 2015 -0500

    * add csv to dump released JamTracks

commit f6101f3621
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 14:26:41 2015 -0500

    VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing

commit 0b67ef5f52
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Sat Aug 15 15:03:00 2015 +0000

    fixed test for instruments in musician search
 2015-09-19 16:33:39 -05:00
Seth Call 3d2eeba638 * found some state/error transition bugs 2015-09-17 22:13:07 -05:00
Seth Call b107df2478 * fix bugs 2015-09-17 17:31:00 -05:00
Seth Call 3538e7b0ae * mark mixdown API 2015-09-15 13:40:15 -05:00
Seth Call ac7f762a1d * edit mixdown API handles 'active' boolean 2015-09-15 12:44:43 -05:00
Seth Call 30965c6351 * allow jamblaster to fetch http 2015-09-15 05:23:27 -05:00
Seth Call 8bcef09ae4 * wip 2015-09-15 05:07:41 -05:00
Seth Call 5fd8722510 * fix web code to stop simulating ios app 2015-09-12 13:56:52 -05:00
Seth Call d5fd7b6384 * make aac work, validate that pitch & speed are integer 2015-09-12 13:49:30 -05:00
Seth Call c57e7fd527 * update show API 2015-09-12 12:38:18 -05:00
Seth Call 0741119a5d Merge branch 'develop' into feature/mixdown 2015-09-12 11:25:24 -05:00
Seth Call ad24f3d3b6 * packager working, apis working 2015-09-11 21:11:19 -05:00
Seth Call 5c8fb6b01e * don't issue stop video in session end 2015-09-11 13:43:07 -05:00
Seth Call 3e27680ea9 * decommision webcam_viewer in session page 2015-09-11 13:40:34 -05:00
Seth Call 9bce6964bd * wip 2015-09-11 12:53:00 -05:00
Seth Call ac1cc0c828 * VRFS-3541 - don't use HTML to store data sent to server for genre ID bug in profile 2015-09-10 07:24:42 -05:00
Seth Call 544ab4539e * wip 2015-09-10 06:08:29 -05:00
Seth Call 004991119a * set 'are you our user' cookie to do better job with ad tracking 2015-09-09 15:10:51 -05:00
Seth Call 2ffd9bb7a7 * wip 2015-09-09 14:49:45 -05:00
Seth Call 13a950e65f * align disable vide obutton better 2015-09-09 07:58:46 -05:00
Seth Call 8c75f41a3f * wip 2015-09-09 07:58:22 -05:00
Seth Call 9722c6cbc6 * whitesapce 2015-09-09 07:45:18 -05:00
Seth Call 3976707b14 * check for video enabled better 2015-09-09 07:13:51 -05:00
Seth Call b483dd537f * better text for video test 2015-09-09 07:02:12 -05:00
Seth Call 2260350fc4 * wip 2015-09-09 06:11:16 -05:00
Seth Call a4f465b6d1 * VRFS-3530, VRFS-3531 - allow user to test and disable video 2015-09-08 20:30:47 -05:00
Seth Call c802759e42 * wip 2015-09-08 15:30:44 -05:00
Seth Call 5df4192356 * mip 2015-09-08 12:33:23 -05:00
Seth Call ba99f88048 * VRFS-3534 - fix start recording API signature 2015-09-08 10:05:26 -05:00
Seth Call e29050b0db wip 2015-09-08 09:59:53 -05:00
Seth Call 386ed8144c * VRFS-3528 - make sure open jamtrack dialog passes 'show_purchased_only' 2015-09-06 19:03:08 -05:00
Seth Call 6d010a561b * deal with too-few tracks on landing page, and the 3rd CTA bubble clipping off text 2015-09-04 20:43:15 -05:00
Seth Call 0076f0205a * VRFS-352 - instrument-centric landing page 2015-09-04 15:00:45 -05:00
Steven Miers 900400f053 VRFS-3359 : Styling, cleanup, more idiomatic react state management for input fields. 2015-09-03 03:53:06 -05:00
Steven Miers 766842f4e7 VRFS-3359 : Teacher pricing 
* Currency fields only appear when both the appropriate pricing option
(column) AND the time range (row).
* Currency fields set state and format on blur
 2015-09-03 03:52:04 -05:00
Steven Miers dace5dd08a VRFS-3359 : New fields in API output and controller spec. 2015-09-03 02:00:18 -05:00
Seth Call 3ee71634b3 * remove test stuff 2015-09-02 09:40:06 -05:00
Seth Call d07ac009bf * VRFS-3509 - case where no device is configured handled 2015-09-01 08:11:35 -05:00
Steven Miers 8ce313f5c7 VRFS-3359 : Teacher pricing 
Display or hide fields depending on checkboxes.
 2015-08-31 23:02:44 -05:00
Steven Miers 005ee8aabd VRFS-3359 : Validate end year greater or equal start year. 2015-08-31 14:56:25 -05:00
Steven Miers 69bb4e469a VRFS-3359 : Teacher Experience List Component 
* Add field label properties to experience list component.  Each of the
three lists can set labels for title and organization.  Date label is
inferred from showEndDate property
* Update usages of this list
* Sort by start_date
* List display uses available fields (e.g., date range when available)
 2015-08-31 13:12:36 -05:00
Steven Miers 0878c5fd3f VRFS-3359 : Proper setting of experience keys and saving. 2015-08-31 11:32:20 -05:00
Seth Call 9420cebad4 * VRFS-3494 - show popup when video window launches for the 1st time to offer guidance 2015-08-30 05:00:00 -05:00
Steven Miers e028a604cf VRFS-3359 : Validate experience forms using HTML5 validations. 2015-08-29 12:52:29 -05:00
Steven Miers 6e62db85eb VRFS-3359 : React component functionality and styles to display various experience lists. 2015-08-28 15:50:20 -05:00
Steven Miers 67696a72d7 VRFS-3359 : Teacher API work 
* Return distinct experience collections for teaching, education, and
awards.
* Update tests for new behavior.
* Responders for language and subject APIs.
 2015-08-28 15:11:52 -05:00
Steven Miers 4eac4ccd7a VRFS-3359 : Style updates, mostly for experience page. 2015-08-28 13:30:32 -05:00
Steven Miers cf6f4046da VRFS-3359 : More react behavior and view updates to generic and specialized components. 2015-08-28 13:30:01 -05:00
Steven Miers 7fe542a1ff VRFS-3359 : Fix classes for various profile setup pages. 2015-08-28 13:27:57 -05:00
Steven Miers 6c25907a58 VRFS-3359 : New react components for profile setup. Incremental 2015-08-27 11:25:48 -05:00
Seth Call c3f81a4d23 * build bump 2015-08-27 10:35:43 -05:00
Seth Call e782d5f9bb * VRFS-3419 - check better for window opener 2015-08-27 09:43:40 -05:00
Seth Call 36b6699cde * validate popup VRFS-3419 2015-08-27 08:14:39 -05:00
Seth Call 8948f0498f * fix changed path 2015-08-27 07:59:21 -05:00
Seth Call 2bce35d604 * fix jamtrack test 2015-08-26 20:38:34 -05:00
Seth Call 63ef63c20d * fix typo again in webcamViewer. need to go to bed 2015-08-26 20:34:40 -05:00
Seth Call 8566cc5bc9 * fix typo added in webcamViewer 2015-08-26 20:31:34 -05:00
Seth Call 22ea6e89fd * VRFS-3488 - jamtrack search by artist and song need to pin to the match, not do a sloppy search 2015-08-26 20:26:39 -05:00
Seth Call a4bd28e168 VRFS-3474 - watch for USB events and refresh video pages 2015-08-26 16:43:34 -05:00
Seth Call d2edfd22c5 * VRFS-3467 - previews are 20 seconds long indicator on jamtracks 2015-08-26 12:01:52 -05:00
Seth Call defdfa8ce9 * VRFS-3473 - fix 'videoShared' state in webcamViewer 2015-08-26 06:04:53 -05:00
Seth Call 7560b340c7 * VRFS-3466 - updated frontend to pass in GUIDs 2015-08-25 14:53:28 -05:00
Seth Call 1252dbe178 * use new bridge calls to handle current FPS and resolution VRFS-3428 2015-08-25 05:28:15 -05:00
Seth Call 6918eaf095 more UI tweaks for video settup in account screen VRFS-3428 2015-08-24 17:55:06 -05:00
Seth Call fc69242578 * VRFS-3427 - update FTUE to test video, not just audio 2015-08-24 16:18:31 -05:00
Seth Call 729974013a * VRFS-3428 - fix button text 2015-08-24 16:17:53 -05:00
Seth Call db1f1d60d5 Merge branch 'feature/video_frontend' into develop 2015-08-24 15:56:42 -05:00
Seth Call 04825d2659 * VRFS-3428 - update how we query backend for frame rates 2015-08-24 15:54:59 -05:00
Steven Miers 78ccf3b9f4 VRFS-3359 : Teacher Setup - Factor out common functionality into a CheckBoxList, of which the instrument selector is composed. 2015-08-21 08:30:44 -05:00
Seth Call 29104ff09b * VRFS-3446 - bug fix for no genre specified on join of session; also fix search bar in jamtrack dialog 2015-08-21 05:02:48 -05:00
Seth Call 3b6d1febdb * forget cta image 2015-08-20 15:44:21 -05:00
Seth Call 6ac622853c * VRFS-3449 - a little more tweaking of JamTrack landing page 2015-08-20 15:02:55 -05:00