Commit Graph

248 Commits

Author SHA1 Message Date
Seth Call a02f7c2dfb * VRFS-2839 - add check to admin 2015-02-25 22:04:58 -06:00
Steven Miers 1de7c86e29 VRFS-2785 : Fields for new purchased jam track. 2015-02-25 09:41:03 -06:00
Seth Call 9dbf1a3e56 * VRFS-2634 adding version to jamtrack 2015-02-23 09:12:34 -06:00
Steven Miers e662c95fba VRFS-2785 : Add Jam Track Right (purchased jam track) to admin ui. Hook up a refund action. 2015-02-19 16:41:09 -06:00
Seth Call 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -06:00
Seth Call b89e6e9475 * VRFS-2748, VRFS-2749 - update styling for / page and home page 2015-02-06 22:04:37 -06:00
Seth Call b5c446dd04 * VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks 2015-01-08 11:38:46 -06:00
Steven Miers 3028e421fb VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Seth Call 405c155c71 * VRFS-2606 get offset time into MM:SS:MLS format 2015-01-07 11:07:26 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks
Conflicts:
	db/manifest
	pb/src/client_container.proto
	ruby/lib/jam_ruby.rb
	web/config/environments/development.rb
	web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Seth Call d83a632d0b Conflicts:
db/manifest
	web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Steven Miers 207b7b9e20 VRFS-1890 : Mechanism to move track up/down, hook up in admin UI. 2014-12-06 14:04:31 -06:00
Steven Miers 41096f08ad VRFS-2480: Additional back-end and UI functionality required for checking out. 2014-12-01 18:45:41 -06:00
Steven Miers 696cdc0283 VRFS-2476 : Field size and length to improve JamTracks Admin UI. 2014-11-16 17:30:49 -06:00
Steven Miers 220195ef5c Friendlier development environment for active admin UI. 2014-11-16 17:00:31 -06:00
Steven Miers 3484f169ba VRFS-2475 - Disallow blank option for Time Signature, Status, Type, Licensor, Pro, Genre and Sales Region fields. 2014-11-16 16:59:54 -06:00
Steven Miers ab2b4fb5da VRFS-2473 - Disallow blank options on jam_track track instrument field, as well as type field. 2014-11-16 16:58:53 -06:00
Steven Miers 497ac657ad VRFS-2351 : JamTracks admin - merge from feature/jam_tracks_merge. 2014-11-16 16:24:00 -06:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Jonathan Kolyer e7b8d05f6d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-10-31 05:05:05 +00:00
Jonathan Kolyer 6f28ca7874 VRFS-2132 modified crash_dumps to accept dump files and upload them to aws 2014-10-31 05:04:48 +00:00
Seth Call 62833198b3 * VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix 2014-10-29 11:28:13 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Seth Call ce8c218054 * pinning devise in adming 2014-10-08 09:29:45 -05:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 8a4038e7ce * pinning capybara-screenshot; it just released a breaking version (1.0.0) 2014-09-17 20:57:49 -05:00
Seth Call 609846c295 * VRFS-2204 - udp_reachable showing now 2014-09-17 20:31:58 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
Seth Call 591432d9d2 * adding sanitize gem to admin 2014-08-19 14:24:50 -05:00
Seth Call e4a8ce3759 * fix broken admin test 2014-08-14 14:08:35 -05:00
Seth Call 5c9f0da222 * make it possible to only see diagnostic info in the admin feed, and further diagnostic info of a certain type 2014-08-14 12:44:46 -05:00
Seth Call 90ec0b3f1a * fix admin tests 2014-08-13 15:32:51 -05:00
Seth Call 4ce9d5fd7c * add prefix to form URL 2014-07-31 21:08:53 -05:00
Seth Call 91399fd94e * bumping max length 2014-07-31 20:21:49 -05:00
Seth Call 209b6f2d7e * sort score histories by date desc 2014-07-29 22:13:38 -05:00
Seth Call 7e810809ac * fixing up end time format in csv export 2014-07-28 23:15:39 -05:00
Seth Call ef87d635e2 * fixing some admin pathing/url issues 2014-07-28 10:05:16 -05:00
Seth Call 50c611d729 * removing debugger gem from admin gemfile for now 2014-07-28 09:49:56 -05:00
Seth Call c65b05993b * adding migrate script to admin 2014-07-27 12:22:35 -05:00
Seth Call 2716211b18 * VRFS-1496 fixing up help text and header text 2014-07-27 11:49:26 -05:00
Seth Call 4f7c1ef22e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-27 11:46:38 -05:00
Seth Call 44ba9ef441 * VRFS-1496 - export CSV 2014-07-27 11:45:46 -05:00
Seth Call 2dd6153ed8 * wip on score export 2014-07-26 14:18:17 -05:00
Jonathan Kolyer e87ae50dfe VRFS-1942 tuning admin view 2014-07-26 04:10:40 +00:00
Jonathan Kolyer d28a65c5ff Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-26 03:59:11 +00:00
Jonathan Kolyer ff73c170bd VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries 2014-07-26 03:58:58 +00:00
Seth Call adb0b15555 * fixing bad schedules on scheduler.yml, and wip on admin web reporting 2014-07-25 15:01:14 -05:00
Seth Call 433148cd55 * adding rubyzip to websocket-gateway and admin 2014-07-19 23:05:20 -05:00
Seth Call 513a46067a * merged 2014-07-19 21:12:11 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Seth Call 5feb642c0f * fixing admin tests 2014-07-14 17:43:07 -05:00
Seth Call eecc402744 * pin faker to 1.3.0 2014-07-03 20:52:36 -05:00
Seth Call 5b8fd14088 * pin jquery-ui-rails to 4.2.1 2014-07-03 20:39:26 -05:00
Seth Call ec6c4d010c * fix Gemfile in admin-web 2014-06-24 11:33:56 -05:00
Seth Call 6d84241cae * merged 2014-06-23 22:28:23 -05:00
Seth Call 5750584769 * VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works 2014-06-23 22:26:27 -05:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Seth Call 526dc3a512 * null guarding timestamps for admin fed 2014-06-15 21:04:06 -05:00
Seth Call 62bf8eb0a0 * allow core dumps and a greater number of handes for the web processes 2014-06-14 13:06:37 -05:00
Seth Call 9edc3a5e24 * fixing bad reference to internet_service_provider 2014-06-13 15:10:47 -05:00
Seth Call 84f1e79223 * pin admin tests 2014-06-03 17:45:48 -05:00
Jonathan Kolyer 30037bc967 VRFS-1698 removed sendgrid email error handling 2014-05-31 09:03:18 +00:00
Jonathan Kolyer b8736ff389 VRFS-1698 changed batch sending to one-at-a-time 2014-05-31 07:44:56 +00:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Anthony Davis 1ce510bb18 VRFS-1705 - 'monitor' subproj initial commit 2014-05-21 16:52:11 -05:00
Seth Call ac2ee3210f * VRFS-1654 - fixing tests 2014-05-13 14:48:58 -05:00
Anthony Davis 9929e1eca1 VRFS-1708 / VRFS-1654 - marking these tests as pending 2014-05-11 15:59:37 -05:00
Seth Call e3b17fb439 * .touch on the history entries 2014-05-09 14:36:03 -05:00
Bert Owen 6ecb7abcad VRFS-1654 issue fixed without test 2014-05-09 23:50:50 +08:00
developer 8f06168f1c VRFS-1654 - configure feed layout 2014-05-08 23:18:57 +08:00
Seth Call 4e9c2377ba * fix broken pages in admin 2014-05-08 08:04:06 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -05:00
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00
Anthony Davis fb1d634875 VRFS-1651 - jam_ gem version does not matter for test_www 2014-05-07 07:33:33 -05:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Seth Call 00a6139cd1 * merged 2014-04-29 14:04:26 +00:00
Seth Call f9e035e621 * adding db 1/0 to test mode 2014-04-23 21:52:35 +00:00
Seth Call bc006b8c71 * adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually 2014-04-23 19:48:40 +00:00
Jonathan Kolyer a7d83064df VRFS-1576 fixing redirect paths to use active_admin_template 2014-04-23 06:39:49 +00:00
Jonathan Kolyer 6ee83f8dcc VRFS-1576 error handling; referral page; new admin menu 2014-04-22 01:55:40 +00:00
Seth Call 76e63193ca * fixing some broken tests 2014-04-09 21:11:13 +00:00
Jonathan Kolyer 887795bead VRFS-1483 final cleanup 2014-04-05 22:16:32 +00:00
Jonathan Kolyer e5d280e374 VRFS-1483 final cleanup 2014-04-05 22:13:28 +00:00
Jonathan Kolyer ce6d143876 VRFS-1483 added authoritzation for email_batch 2014-04-05 21:42:56 +00:00
Jonathan Kolyer 15090e3c70 VRFS-1483 error collector; cleanup 2014-04-05 21:25:47 +00:00
Jonathan Kolyer e59d9cbe7a VRFS-1483 email error handling 2014-04-05 18:52:12 +00:00
Jonathan Kolyer 4e95c7cbd5 VRFS-1483 changed instructions to indicate default hiding of admin session 2014-04-05 18:26:16 +00:00
Brian Smith b17dafd94f Merge branch 'develop' into hotfix/feed_icon_fix 2014-04-01 21:31:07 -04:00
Jonathan Kolyer accaa99e38 VRFS-1483 integrating opt-out; fixing tests 2014-04-01 14:42:26 +00:00
Brian Smith 925c5831af VRFS-1445 display correct values of musician flag and country in admin 2014-04-01 01:18:31 -04:00
Jonathan Kolyer e29907f09b merging 2014-03-19 18:44:35 +00:00