Steven Miers
f0c22433c3
Merge with develop
...
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-08-29 12:56:27 -05:00
Steven Miers
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
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
36b4179492
* VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only)
2015-03-20 17:26:56 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Steven Miers
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Seth Call
e4a8ce3759
* fix broken admin test
2014-08-14 14:08:35 -05:00
Seth Call
90ec0b3f1a
* fix admin tests
2014-08-13 15:32:51 -05:00
Seth Call
5feb642c0f
* fixing admin tests
2014-07-14 17:43:07 -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
e4da30f39e
* wip
2014-05-29 14:39:08 -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
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
Seth Call
9e561c047a
* VRFS-1103 - coverage for all projects. need to figure out how to merge all
2014-02-13 22:11:30 -06:00
Jonathan Kolyer
291a3a8ac2
vrfs-774: changing country value from USA to US for max_mind_geo support
2013-11-03 01:49:10 -06:00
Seth Call
7c7eca0964
* fixing up admin tests after changing their menu label
2013-10-16 12:28:44 -05:00
Seth Call
c8150c8aee
merging jam-admin into admin
2013-09-16 03:15:31 +00:00