Seth Call
0264c539b1
*hardcoding https where http is found
2015-05-15 18:25:47 -05:00
Seth Call
939f8cdf82
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
Seth Call
62b6820e90
* VRFS-3220 - estimate taxes manually
2015-05-09 08:30:12 -05:00
7b5cdbf390
VRFS-3106 : Populate country name and state(region) labels using carmen gem.
2015-05-06 15:35:41 -05:00
Seth Call
96df8cbfea
* disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task)
2015-05-05 11:44:28 -05:00
d4d8489ef1
VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures.
2015-04-30 19:31:44 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
Seth Call
9480aadaae
Conflicts:
...
ruby/lib/jam_ruby/models/jam_track_track.rb
2015-04-20 13:55:33 -05:00
Seth Call
022304c6af
* VRFS-3065 - permission error name change
2015-04-20 10:42:09 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
2f8d048dde
VRFS-2701 updated site validator lib to extract recording title for YouTube and SoundCloud URLs
2015-04-04 02:31:12 -04:00
1f432446f5
VRFS-2795 fixing results display; generating same data
2015-04-04 02:54:58 +00:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
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
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00: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
Seth Call
3496aa999f
* wip
2015-01-29 14:17:55 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -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
Seth Call
2306948f9c
* whack the default domain cookie if we see an attempt to invalidate
2014-03-21 16:20:34 +00:00
Seth Call
b058f19692
* VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure)
2014-03-21 03:23:33 +00:00
Seth Call
7cdd47ac89
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-20 11:53:35 +00:00
Seth Call
b04c7bcea5
* VRFS-871 - user-to-user messaging complete
2014-03-20 11:53:26 +00:00
82ad25795c
disable countries methods which are no longer supported
2014-03-17 22:27:38 -05:00
ddabbcecc5
fix countries to use labels for users, bands, and new signups
2014-03-17 22:20:41 -05:00
60aa59e11f
faster signup
2014-03-11 17:35:00 -05:00
2dd8ad0be8
data models for countries, regions, and cities tables.
2014-03-11 13:20:00 -05:00
af748cba75
rake tasks for importing geoip data
2014-03-09 17:35:12 -05:00
f8e06c476d
fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions.
2014-03-09 00:22:51 -06:00
667c629c27
VRFS-1052 fix timestamp issue with notifications (moved to timeago plugin)
2014-03-07 01:30:23 -05:00
49269443da
VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type
2014-03-07 00:38:10 -05:00
Seth Call
1c2585ba92
* VRFS-1047 mosttly done, aside from jamfet link
2014-03-05 17:18:53 -06:00
Seth Call
7ab7bfd795
* VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state
2014-03-03 16:13:23 -06:00
Seth Call
7a820e7827
* VRFS-726 - don't care if ftue has succeeded before; we care if there are any good devices
2014-03-01 08:58:42 -06:00
Seth Call
7882d65dc7
* VRFS-1165 resolved for real this time
2014-02-25 21:25:59 +00:00
Seth Call
7753a2d4b3
* VRFS-1228 - can add, but not update ,user biography
2014-02-25 05:41:43 +00:00
Seth Call
dae0f40929
* removed is_downloadable for VRFS-1141, from database and UI
...
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
e0ae2e378e
VRFS-1194 changed recording/session drop-down list selection to unique ID text input
2014-02-20 10:01:25 -06:00
Seth Call
df14676495
* VRFS-1135 - user and band targetting possible
2014-02-20 07:45:51 +00:00
Seth Call
857dd27404
* VRFS-1191, VRFS-1120, VRFS-1079, VRFS-1087, VRFS-1190, VRFS-1192--many band page changes, fixes. small fix for notification icons showing orange circle if icon_url not specified
2014-02-19 22:56:13 +00:00
Seth Call
e3d34fb7b2
* VRFS-1171 - forgot join_music_session is called twice
2014-02-18 22:43:21 +00:00
Seth Call
4e674b312c
* VRFS-1171 - resolved by moving notification out of transaction
2014-02-18 22:35:23 +00:00
83f347e84c
merge like/follow refactor and hover bubble work
2014-02-16 16:03:32 -05:00
36287d0b5f
VRFS-1028 hover bubble / like and follow refactor
2014-02-16 02:28:35 -05:00
Seth Call
ac677ebdf1
* adding sample data building to create a recording with a mix. VRFS-1135
2014-02-16 03:37:54 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
Seth Call
96768b7979
* VRFS-1022 finished
2014-01-25 14:03:14 -06:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
Seth Call
1f37b9881f
* parameterizing email configs and trying to speed up build on server
2014-01-14 16:55:34 -06:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
Seth Call
f5a271c35b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-11 04:57:30 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
85d6129a50
vrfs-927: fixing latest promotions
2014-01-10 18:10:14 -06:00
18d8ff8d3f
VRFS-933 notification bug fixes
2014-01-05 16:42:18 -05:00
6dec9a5239
fix tests
2014-01-04 20:25:05 -05:00
3872898b95
VRFS-933 notification work
2014-01-02 14:57:16 -05:00
Seth Call
a68235f280
* adding 'select' to dialog-inner so it'll look JKish
2013-12-20 22:24:14 +00:00
Seth Call
d97a960a0e
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:21 +00:00
020f9d544e
vrfs-884: tweaking layout
2013-12-17 10:59:16 -06:00
a354f6c6d5
vrfs-884: updating sample data for bands
2013-12-16 12:28:21 -06:00
1d0b07cbe1
vrfs-775: fixed arg handling in new musicians email
2013-11-27 23:35:16 -06:00
e57a276144
vrfs-775: added rake task; updating plain text email
2013-11-26 09:00:50 -06:00
Seth Call
95bc077634
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
2013-11-16 14:05:23 +00:00
4e262de50a
vrfs-774: fixed counters
2013-11-06 07:50:34 -06:00
0813c6efd0
vrfs-774: changed search counter names to use search_ prefix; added recording and sessions counters
2013-11-05 06:25:36 -06:00
16cddf67d2
vrfs-774: added search tests, ui integration
2013-11-05 04:23:01 -06:00
Seth Call
db76c34ba5
* VRFS-813 -most all frontend changes needed for start/stop recordings
2013-11-03 14:55:55 -06:00
2b19744683
vrfs-774: replaced original max_geo_isp db cols
2013-11-03 02:45:54 -06:00
e1bce5eed8
vrfs-774: impl musician searches
2013-10-28 21:42:36 -05:00
Seth Call
b918406edf
* VRFS-767, VRFS-781 - create account page updated, web layout will now expand black bar as needed
2013-10-22 12:38:21 -05:00
70cba2d98d
VRFS-595 session invitations / fix bug with session join notifications arriving twice
2013-10-05 09:04:07 -04:00
Seth Call
f38ca2721a
* VRFS-734 - adding all user progression tracking that is possible currently
2013-09-30 02:37:22 +00:00
Seth Call
cf907cc060
* VRFS-711 - adding new welcome email with useful links
2013-09-26 13:43:02 +00:00
Seth Call
2f41675471
merging jam-web into web
2013-09-15 18:04:37 +00:00
Seth Call
Steven Miers
Jonathan Kolyer
Brian Smith
Scott Comer