Steven Miers
|
bb4ea7cd94
|
Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2
|
2015-03-26 11:59:42 -05:00 |
|
Steven Miers
|
77a3ea7e6b
|
Merge branch 'develop' into feature/jam_track_ui_2
|
2015-03-26 11:58:47 -05:00 |
 Seth Call
|
ef78471b59
|
Merge cherry pick
|
2015-03-26 11:58:41 -05:00 |
|
Seth Call
|
8d296e6b8e
|
* remove code that I did not mean to commit
|
2015-03-25 14:33:27 -05:00 |
|
Seth Call
|
0848a59082
|
* merged develop again
|
2015-03-25 14:32:03 -05:00 |
|
Seth Call
|
5bd05321ef
|
* add user to PlayablePlay factor
|
2015-03-25 14:20:52 -05:00 |
|
Steven Miers
|
d0e036252e
|
Touch
|
2015-03-25 17:09:08 +00:00 |
|
Seth Call
|
54853afd3b
|
* fake bump for build server
|
2015-03-25 11:27:28 -05:00 |
|
Seth Call
|
f0c4647ef5
|
* VRFS-2981 - check for create_type = nil in scheduled_rsvp
|
2015-03-25 11:26:32 -05:00 |
|
Seth Call
|
53ef0f1b4f
|
VRFS-2975 - change jam track Id to varchar(64)
|
2015-03-25 11:11:10 -05:00 |
|
Steven Miers
|
5f953d1b19
|
VRFS-2830 : Merge / manual fix
|
2015-03-25 10:56:24 -05:00 |
|
Seth Call
|
6885424668
|
* allow admin to open jamtrack
|
2015-03-25 09:34:43 -05:00 |
|
Steven Miers
|
adef8c8c45
|
VRFS-2830 : Payment History
API, client, view, styles and test
|
2015-03-24 17:13:09 -05:00 |
|
Seth Call
|
f51b11b2e0
|
* VRFS-2979 - show jamtracks tile if admin
|
2015-03-24 15:20:56 -05:00 |
|
Seth Call
|
7510b098ab
|
* fix two tests needing new method of uploading
|
2015-03-24 15:07:33 -05:00 |
|
Seth Call
|
18563ff065
|
* VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling
|
2015-03-24 14:59:20 -05:00 |
|
Seth Call
|
bfe302b2f1
|
* merged
|
2015-03-24 14:43:48 -05:00 |
|
Seth Call
|
ccd60aa631
|
* merged develop
|
2015-03-24 11:27:26 -05:00 |
|
Seth Call
|
1c0407cca4
|
* wip
|
2015-03-24 10:19:21 -05:00 |
|
Steven Miers
|
5e2d860bf7
|
VRFS-2830 : License dialog and hookup
|
2015-03-23 15:38:55 -05:00 |
Jonathan Kolyer
|
98ea77a5e0
|
Merge branch 'develop' into feature/cohort_data
|
2015-03-23 20:07:24 +00:00 |
|
Jonathan Kolyer
|
8c2df0bb6b
|
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
|
2015-03-23 20:06:32 +00:00 |
|
Seth Call
|
04aa1a9b3c
|
* wip
|
2015-03-23 08:52:52 -05:00 |
|
Jonathan Kolyer
|
153d79749c
|
VRFS-2972 for jam_track_rights, exclude is_test_purchase=true
|
2015-03-23 07:03:57 +00:00 |
|
Jonathan Kolyer
|
dd23b38f4e
|
VRFS-2916 fixed subquery override from block
|
2015-03-23 04:48:13 +00:00 |
Brian Smith
|
3ae34fc426
|
VRFS-2974 fixed broadcast widget bug when session is private
|
2015-03-22 21:30:08 -04:00 |
|
Seth Call
|
128a8119cf
|
* VRFS-2942 - show correct instrument and show correct part info
|
2015-03-20 22:04:03 -05:00 |
|
Seth Call
|
b137d7586f
|
* VRFS-2973 - fix pagination in jam trackdialog
|
2015-03-20 21:27:11 -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
|
f29a9d7465
|
* wip
|
2015-03-20 16:15:13 -05:00 |
|
Steven Miers
|
e3d1a80a6f
|
VRFS-2830 : Mesh out purchased jam tracks view and behavior.
|
2015-03-20 15:26:06 -05:00 |
|
Seth Call
|
49368e2e66
|
Merge branch 'hotfix/recording_fix' into develop
|
2015-03-20 11:26:50 -05:00 |
|
Seth Call
|
3cb706495e
|
* wip
|
2015-03-20 11:25:42 -05:00 |
|
Seth Call
|
d44236abc4
|
remove jamblaster notice from site
|
2015-03-20 09:58:58 -05:00 |
|
Seth Call
|
6df6165bb7
|
remove jamblaster notice from site
|
2015-03-20 09:55:35 -05:00 |
|
Seth Call
|
301b365044
|
* VRFS-2968 - escape strings passed to JamTrack builder
|
2015-03-20 09:44:25 -05:00 |
|
Seth Call
|
393f05f9b0
|
* wip
|
2015-03-20 09:21:29 -05:00 |
|
Seth Call
|
10f25be8c4
|
* replace old style of volume changes VRFS-2964
|
2015-03-20 08:53:34 -05:00 |
|
Seth Call
|
6032d91725
|
Merge branch 'master' into develop
|
2015-03-20 08:50:04 -05:00 |
|
Seth Call
|
661c4ed446
|
* wip
|
2015-03-20 08:48:00 -05:00 |
|
Jonathan Kolyer
|
cba86f4db4
|
VRFS-2916 added totals; limit month range to 1; filled out all unpopulated cols with 0; misc tweaks
|
2015-03-20 08:06:02 +00:00 |
|
Jonathan Kolyer
|
5621f227b8
|
VRFS-2916 formatting, added jam_track_played placeholders
|
2015-03-19 06:07:43 +00:00 |
|
Steven Miers
|
abb31c4e40
|
VFFS-2830 : Jam tracks account overview
|
2015-03-17 13:52:30 -05:00 |
|
Seth Call
|
cfd80927f9
|
* fix broken tests that occurred when removing mount_uploader from jam_track_track
|
2015-03-17 13:39:21 -05:00 |
|
Seth Call
|
bb35535262
|
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
|
2015-03-17 10:55:16 -05:00 |
|
Seth Call
|
5269520924
|
* fix bug in earliest cohort code
|
2015-03-17 10:36:41 -05:00 |
|
Seth Call
|
137c6faedc
|
* wip
|
2015-03-17 10:15:00 -05:00 |
|
Jonathan Kolyer
|
188274cbb5
|
merging feature/cohort_data with develop
|
2015-03-17 05:33:01 +00:00 |
|
Jonathan Kolyer
|
a577a6e43e
|
VRFS-2916 monthly tweaking
|
2015-03-17 05:31:04 +00:00 |
|
Jonathan Kolyer
|
4a0aa25785
|
VRFS-2916 monthly filter
|
2015-03-17 05:04:13 +00:00 |