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

5248 Commits

Author SHA1 Message Date
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -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 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
Jonathan Kolyer 5ee4784417 VRFS-2916 admin index 2015-03-17 01:34:04 +00:00
Seth Call ab72438a3f * VRFS-2932 - make preview apply to all jam track tracks 2015-03-16 17:50:38 -05:00
Seth Call b4d581dbc1 * VRFS-2936 - ugly button for Peter testing 2015-03-16 16:04:44 -05:00
Seth Call c2abab8982 * VRFS-2936 - ugly button for Peter testing 2015-03-16 16:04:29 -05:00
Seth Call 9dd3984d07 * VRFS-2936 - ugly button for Peter testing 2015-03-16 13:36:02 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Jonathan Kolyer 420c00e3b5 VRFS-2916 fixed monthly queries 2015-03-16 06:03:36 +00:00
Steven Miers 07b74cc3e7 VRFS-2823 : Enable proper back button behavior. 2015-03-16 00:29:57 -05:00
Steven Miers 4e99505d2a VRFS-2877 : Update look and feel of cart 
* New checkmark icon
* Use table layout instead of width/float
* Misc layout fixes
 2015-03-15 21:32:37 -05:00
Steven Miers e6b09e5728 VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow. 2015-03-15 20:30:39 -05:00
Steven Miers f3f655720c VRFS-2896 : Show proper state on jam track re: purchased or already in cart. 2015-03-15 20:22:02 -05:00
Steven Miers 4d04558c88 Capitalize TODO 2015-03-15 19:57:08 -05:00