aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
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
e466ca0f5a
VRFS-2698 implemented site_validator
2015-02-08 06:10:31 +00:00
90f3d9efe1
VRFS-2698 refactoring
2015-02-06 07:43:24 +00:00
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
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
16667a9ce3
Fix typo.
2015-01-05 17:25:43 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
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
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
0808ce04f9
Address test failure by actually creating the jam_track_right.
2014-12-03 13:48:14 -06:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
0ec65738f1
Kill another puts.
2014-12-01 11:59:15 -06:00
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
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
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
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
932513a00b
added task users:fix_corrupted_country_codes
2014-06-30 12:26:46 +00:00
05b3d855d7
VRFS-1458 cleaned up labels and selection issues with country/region/city selects
2014-06-25 14:49:33 +00:00
67b7e40179
VRFS-1672 session settings dialog work
2014-06-25 02:26:36 -04:00
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
Seth Call
4a603cbaa2
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
2014-06-09 15:43:16 -05:00
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
bf06df36a3
added better regions database; added appropriate indexing for regions table
2014-05-22 15:17:00 -05:00
27517c673f
VRFS-1668 more test fixes
2014-05-14 01:51:18 -04:00
00e177311d
tests for last jam location setting and some cleanup of user manager and user location spec
2014-05-13 14:56:58 -05:00
ca27a6ab97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
db/manifest
2014-05-08 19:47:17 -05:00
3f688a8392
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
2014-05-08 19:44:52 -05:00
Seth Call
732fd66f0e
* all tests pass; but need to now rename music session tables to match class names...
2014-05-06 16:17:26 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
937efed3e5
VRFS-1576 affiliate_partner model
2014-04-20 22:54:49 +00:00
Steven Miers
Jonathan Kolyer
Seth Call
Brian Smith
Scott Comer