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

118 Commits

Author SHA1 Message Date
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call 38849a1c44 VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes 2015-02-19 15:56:42 -06:00
Seth Call 9345d65f06 * merged 2015-02-19 14:31:00 -06:00
Steven Miers 0907c1acd1 VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
Jonathan Kolyer 6a46ad5910 Merge branch 'develop' into feature/recording_selector 2015-02-16 02:20:38 +00:00
Jonathan Kolyer 6ff4d197ef VRFS-2700 recording source jasmine tests 2015-02-15 23:10:29 +00:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Jonathan Kolyer 5e6a63db2e VRFS-2700 added rec_* site types to site validation 2015-02-12 08:16:54 +00:00
Jonathan Kolyer fa25e87659 Merge branch 'develop' into feature/site_validator 2015-02-10 03:17:33 +00:00
Seth Call df60a43404 * adding gear dump 2015-02-09 18:07:49 -06:00
Jonathan Kolyer e466ca0f5a VRFS-2698 implemented site_validator 2015-02-08 06:10:31 +00:00
Jonathan Kolyer 90f3d9efe1 VRFS-2698 refactoring 2015-02-06 07:43:24 +00:00
Jonathan Kolyer d52f5b2372 VRFS-2698 repurposed urls into usernames 2015-02-06 07:43:24 +00:00
Seth Call ac1271634d * VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip) 2015-01-31 15:20:48 -06:00
Seth Call 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Seth Call 3496aa999f * wip 2015-01-29 14:17:55 -06:00
Seth Call f53c5c9612 *wip 2015-01-26 21:22:44 -06:00
Steven Miers a900087d87 VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests. 2015-01-11 19:17:18 -06:00
Seth Call e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -06:00
Seth Call 99f5e46ff6 * another quick fix for broken databasecleaner transaction cleanup 2015-01-07 16:57:25 -06:00
Steven Miers 16667a9ce3 Fix typo. 2015-01-05 17:25:43 -06:00
Steven Miers 6cfe5decbf Merge branch 'develop' into feature/nocaptcha 2015-01-05 17:04:13 -06:00
Steven Miers 9d5d36f059 VRFS-2540 : Clean out some existing recaptcha scaffolding. 
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails.  Respect application config for
“recaptcha_enable” at all levels higher than user level.  Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
 2015-01-05 17:01:28 -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 8a84ff5609 * fix broken tests because of removal of diagnostics, and fix bad logging pattern 2014-12-31 23:17:47 -06:00
Seth Call 116cf8cfce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-31 20:39:27 -06:00
Seth Call 71399dcaa7 * fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting 2014-12-31 20:39:22 -06:00
Steven Miers 83bd5b6c6e VRFS-2588 : YouTube client, remove logging 
Also, do some misc cleanup.
 2014-12-31 19:35:20 -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 0808ce04f9 Address test failure by actually creating the jam_track_right. 2014-12-03 13:48:14 -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 0ec65738f1 Kill another puts. 2014-12-01 11:59:15 -06:00
Steven Miers 7f59067226 VRFS-2480 : Refactor and cleanup, incremental. 2014-11-25 14:35:05 -06:00
Steven Miers 0b5d85f4f2 VRFS-2480 : Extract recurly logic from controller for cleaner, easier-to-test code. 2014-11-21 17:34:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Seth Call 3fc0329e79 * wip 2014-11-13 09:20:08 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Brian Smith f296932f27 fix more session join/leave bugs 2014-09-14 15:12:25 -04:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Seth Call 699e8a6c5d * check for empty file for VRFS-1988 2014-07-30 15:44:46 -05:00
Seth Call 00993acfed * VRFS-1988 set up infra to allow for scheduler.yml override file 2014-07-30 15:35:56 -05:00
Seth Call 2f76a82bd3 * fix changes to resque-scheduler includes 2014-07-27 12:46:20 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Seth Call c2a5936720 * wip 2014-07-14 15:53:04 -05:00
Jonathan Kolyer 932513a00b added task users:fix_corrupted_country_codes 2014-06-30 12:26:46 +00:00