seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
2,864 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

2864 Commits

Author SHA1 Message Date
Seth Call 8ee250d550 * VRFS-560, VRFS-898, VRFS-597, VRFS-1153, VRFS-1154 - all ftue related fixes and improvements in user behavior. make new ftue show up everywhere instead of new ftue 2014-02-21 22:02:51 +00:00
Seth Call abfba1ac37 * tweak build file 2014-02-21 20:45:12 +00:00
Daniel Weigh 8b64323bd7 VRFS-611 move avatar to left col. 2014-02-20 22:00:22 -05:00
Scott Comer 9d5958175b * merged 2014-02-20 20:40:22 -06:00
Scott Comer 451976aabd integrate scoring stubs work, worklist, and record 2014-02-20 20:30:40 -06:00
Brian Smith 84f8d7b23f hide play button if audio is not available 2014-02-20 21:10:30 -05:00
Brian Smith fc004ea914 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 21:02:52 -05:00
Brian Smith 73dce2906d fix issue with recording url construction 2014-02-20 21:02:41 -05:00
Daniel Weigh 4e659813ef VRFS-611 wrapping of instruments in profile page 2014-02-20 20:48:11 -05:00
Brian Smith f85f0fa956 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 20:46:54 -05:00
Brian Smith c619d867ef re-enable test 2014-02-20 20:46:33 -05:00
Brian Smith 2369aa80a8 VRFS-1188 VRFS-1189 check if audio paths exist 2014-02-20 20:46:09 -05:00
Daniel Weigh fa1e554bf7 VFRS-1197 FAQ link 2014-02-20 20:13:13 -05:00
Daniel Weigh 6806b2ebcd VRFS-1203 fix path to asset 2014-02-20 19:52:21 -05:00
Jonathan Kolyer cb40419f76 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-21 00:32:38 +00:00
Jonathan Kolyer 91b05073d1 VRFS-684 added selection of first entry by default to support Enter key 2014-02-21 00:32:23 +00:00
Seth Call 27afed64dc * adding code to try web tests 2x if a hang is detected 2014-02-20 23:22:31 +00:00
Seth Call a6b3abdc3a * VRFS-1200 - api for toggling favorite is done 2014-02-20 22:56:00 +00:00
Seth Call f3c09f65c2 * allowing tests to be skipped, and mostly done with VRFS-1200 2014-02-20 22:23:44 +00:00
Seth Call 1472944648 * fixnig feed tests 2014-02-20 21:09:41 +00:00
Seth Call 9ca1149daf * fix accidental typo in hover-recording 2014-02-20 20:59:50 +00:00
Seth Call aab902e8cf * VRFS-1160 - favorites REST API done 2014-02-20 20:54:35 +00:00
Seth Call 061c74f8c6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 16:28:45 +00:00
Seth Call f353c04900 * VRFS-1135 - add unique_user_histories to MusicUserHistory, and render that in feed 2014-02-20 16:20:20 +00:00
Jonathan Kolyer e0ae2e378e VRFS-1194 changed recording/session drop-down list selection to unique ID text input 2014-02-20 10:01:25 -06:00
Jonathan Kolyer b281349bec Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 09:11:44 -06:00
Jonathan Kolyer d831cae7c7 VRFS-1193 fixed landing page promo buzz image display 2014-02-20 09:07:59 -06:00
Seth Call cf75da7774 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 14:16:36 +00:00
Seth Call c285734bb4 * remove whitespace 2014-02-20 14:16:24 +00:00
Brian Smith 98178b28f2 VRFS-1189 fix bug 2014-02-20 08:40:28 -05:00
Brian Smith eed5c74835 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 08:38:46 -05:00
Brian Smith e8e224dbaa VRFS-1189 music session playback 2014-02-20 08:38:36 -05:00
Seth Call db15c37a53 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 08:03:02 +00:00
Seth Call cda7ef8ce9 * revert back spec_helper 2014-02-20 08:02:50 +00:00
Seth Call 1940e6d8ff * VRFS-1135 a few more tests in controller for user and band targetting 2014-02-20 08:01:18 +00:00
Seth Call df14676495 * VRFS-1135 - user and band targetting possible 2014-02-20 07:45:51 +00:00
Brian Smith f37e7de42e VRFS-1188 remove hard-coded audio source / reset slider when playback is complete 2014-02-20 02:07:09 -05:00
Brian Smith e92cf83035 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 02:03:20 -05:00
Brian Smith 1ecc21fd9c VRFS-1188 play/pause for recording landing page 2014-02-20 02:03:00 -05:00
Daniel Weigh ca64966c7f * duplicate entry 
$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
 2014-02-20 00:30:25 -05:00
Daniel Weigh 069e9c8297 VRFS-1135 allow empty string to be passed in to start parameter 
(due to jQuery not stripping null / empty params and refactor)
 2014-02-20 00:29:28 -05:00
Brian Smith 85f8bf6cad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-19 22:48:47 -05:00
Brian Smith 956ff422f4 fix sidebar for recordings 2014-02-19 22:48:34 -05:00
Seth Call 3efb3fc5ab * feed test fixes 2014-02-20 03:23:38 +00:00
Seth Call 455ddecaaa Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 02:28:31 +00:00
Seth Call 6aae1ef0e6 * VRFS-1135 add time filters and type filter 2014-02-20 02:22:41 +00:00
Brian Smith 9bd673e67d VRFS-1185 fix piano and upright bass icons 2014-02-19 21:07:03 -05:00
Brian Smith 76d8e84a62 check for empty comment before posting 2014-02-19 20:35:34 -05:00
Brian Smith c95a650cdc add POST button to landing pages for comments, add like_count back to session model 2014-02-19 20:31:44 -05:00
Brian Smith f388f1c7e2 add likes and play count back to model...not sure how it got deleted 2014-02-19 20:06:40 -05:00