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

2094 Commits

Author SHA1 Message Date
Seth Call 8f5a2a6369 * tell NOKOGIRI to use system libraries in build environment 2014-01-26 14:46:11 -06:00
Seth Call 576e8deeee * fixing recursion bug in eventmachine.rb 2014-01-26 19:51:56 +00:00
Seth Call 8cf8e7ae1d * skip Unicorn check when running a worker 2014-01-25 22:31:06 -06:00
Seth Call afb0f30c9f * still working on this bugsnag issue VRFS-1023 2014-01-25 21:24:14 -06:00
Seth Call d23ca37a82 * fix for VRFS-1023; bugsnag preventing rails from starting 2014-01-25 21:07:39 -06:00
Seth Call 90583f8463 * actually comment out audiomixer tests, hwich fail on server 2014-01-25 18:53:59 -06:00
Seth Call ad1521c98b * VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec 2014-01-25 17:38:03 -06:00
Seth Call d93d27db52 * trying to disable testsgg 2014-01-25 16:48:24 -06:00
Seth Call bf7b09e820 * marking a few tests as pending 2014-01-25 16:23:57 -06:00
Seth Call e63e718091 * merged 2014-01-25 14:19:12 -06:00
Seth Call 96768b7979 * VRFS-1022 finished 2014-01-25 14:03:14 -06:00
Brian Smith d6a38f6bee VRFS-986 bug fixes 2014-01-23 21:43:49 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Seth Call 35466433ca Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-22 16:23:46 -06:00
Seth Call 4b13c5c16c * making ubuntu command need sudo, and adding ubuntu template maker 2014-01-22 16:23:33 -06:00
Seth Call 7c375278f8 * fixing jamadmin pages 2014-01-21 20:30:40 -06:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Brian Smith 6660102982 VRFS-986 landing page work 2014-01-20 09:28:06 -05:00
Brian Smith eea5cc781e VRFS-986 landing page work 2014-01-19 17:23:10 -05:00
Seth Call dea36d897f * VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED 2014-01-19 05:17:30 +00:00
Seth Call 5c8e315ee5 * pending didn't take 2014-01-19 03:32:36 +00:00
Seth Call 13f711754c * suppressing the other failing test on the build server 2014-01-19 03:14:00 +00:00
Seth Call 4e05affc77 * disabling audiomixer tests until I figure out why it's failing on audiomixer 2014-01-19 02:56:35 +00:00
Seth Call e57946afd2 * fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006) 2014-01-19 02:20:44 +00:00
Seth Call f327317ede Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-17 19:55:42 +00:00
Seth Call 8644f4cbc3 * VRFS-1006 admin pages added to icecast 2014-01-17 19:55:26 +00:00
Seth Call 5d6e34f374 * VRFS-1000 - mapped all the castles, got the xml working, and added more tests 2014-01-17 04:51:19 +00:00
Seth Call cfa2ba383a * fixing EM test and removing old pending tests 2014-01-16 12:37:25 +00:00
Seth Call ece0b9bf87 * suppressing puts to stdout in test runs 2014-01-16 03:29:52 +00:00
Seth Call 01e50b45b3 * fixes for EventMachine initialization to work in ruby-only context (without web) 2014-01-16 02:21:28 +00:00
Seth Call 7d90425864 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 22:20:29 +00:00
Seth Call 63d6f428b3 * VRFS-997 - mix notifications 2014-01-15 22:15:33 +00:00
Seth Call dc781f04ad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 18:00:59 +00:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Jonathan Kolyer 42713f4c9d vrfs152: allowing invited_users to have null email 2014-01-15 04:10:13 -06:00
Jonathan Kolyer 8f7a959a9e vrfs152: relaxed requirement for an email address 2014-01-15 03:56:46 -06:00
Seth Call f6d1869d52 * adding folders for the various jobs 2014-01-14 21:16:38 -06:00
jam 10687093c1 Resolve conflicts 2014-01-14 21:24:45 +00:00
jam b15604c148 Icecast modules and test 2014-01-14 21:22:05 +00:00
Daniel Weigh 4bdd77f171 * placeholder scroller for feed. 2014-01-21 21:56:35 -05:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Seth Call a7fa73cfb3 * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00
Seth Call 50595d155c * VRFS-801 - closer to all fixes required for mixing 2014-01-13 13:44:28 +00:00
Seth Call 8f5b021464 * adding fixed test 2014-01-13 13:23:09 +00:00
Seth Call da784f2cd0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-13 11:23:41 +00:00
Seth Call a61ff76dae * stringifying id field in response to client downloads 2014-01-13 11:23:35 +00:00
Jonathan Kolyer c4d04adb77 vrfs988: fixed broken search test 2014-01-12 22:23:18 -06:00
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05:00
Jonathan Kolyer e0d8dd286a vrfs988: updated to work with new search attribute names 2014-01-12 02:58:04 -06:00
Jonathan Kolyer e539157d76 Merge branch 'develop' into vrfs988 2014-01-12 02:53:11 -06:00
Jonathan Kolyer 74e95ad908 vrfs988: added band spec and band.website value integrity on save 2014-01-12 02:49:57 -06:00
Jonathan Kolyer 48bde580ae vrfs988: fixed filter searchtype bug 2014-01-12 01:48:15 -06:00
Jonathan Kolyer da980ce699 vrfs988: refactoring search results; added fans/bands result template handling 2014-01-11 23:34:23 -06:00
Jonathan Kolyer 87ae9d97df vrfs988: refactored search with one accessor for text and filter type searches 2014-01-11 09:27:56 -06:00
Jonathan Kolyer ecdfde2cdb vrfs988: sync api wrapper with search model 2014-01-11 09:12:26 -06:00
Jonathan Kolyer 0279b05454 vrfs-988: fixed text search return value 2014-01-11 08:59:09 -06:00
Jonathan Kolyer ac100e0898 vtfs-988: fixing user text search to use musician 2014-01-11 06:50:51 -06:00
Jonathan Kolyer fa0b3eeb70 vrfs-988: ran band_search tests 2014-01-11 06:37:55 -06:00
Jonathan Kolyer 3d75f8dd97 vrfs-988: refactoring search as text by entity, rather than site-wide 2014-01-11 06:26:40 -06:00
Seth Call 26f751cdc4 * sending 'downloadavailable' messages when mix becomes available 2014-01-11 05:34:26 +00:00
Seth Call eb7adbd303 * working out more issues with VRFS-801 2014-01-11 05:23:29 +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
Jonathan Kolyer 401a97d566 Merge branch 'develop' into vrfs927 2014-01-10 18:13:00 -06:00
Jonathan Kolyer 85d6129a50 vrfs-927: fixing latest promotions 2014-01-10 18:10:14 -06:00
jam 7ec4be3063 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-10 23:53:25 +00:00
jam b01fb4a818 baseline for icecast test cases 2014-01-10 23:53:16 +00:00
jam 09f30e3880 Support for xml with attr_accessor 2014-01-10 21:02:52 +00:00
Jonathan Kolyer 08e7496a40 merge conflict 2014-01-08 21:33:15 -06:00
Seth Call be2a7ecc48 * removing git merge syntax from jam_ruby 2014-01-09 13:53:47 +00:00
Jonathan Kolyer c576901d0d fixed merge conflict 2014-01-08 21:32:23 -06:00
Seth Call 0b723362ae * adding resque to websocket-gateway 2014-01-09 02:53:04 +00:00
Jonathan Kolyer e5d23cc3bd merge conflicts 2014-01-08 18:45:34 -06:00
Jonathan Kolyer 785817d299 vrfs-927: added initial promo latest support 2014-01-08 18:38:04 -06:00
Jonathan Kolyer 4b85863a33 vrfs-927: buzz admin fixes 2014-01-08 18:00:22 -06:00
Seth Call 83409e9da8 * adding resque gem to Gemfile 2014-01-08 22:55:44 +00:00
Seth Call 519650e265 * typo in audiomixer 2014-01-08 22:05:41 +00:00
Seth Call 207481ffbd * audiomixer move 2014-01-08 21:49:04 +00:00
Seth Call 59bf00a97e * DownloadAvailable proto msg added to help poke client when downloads become available 2014-01-08 21:24:21 +00:00
Anthony Davis 9127d1861d VRFS-923 commenting out AWS wipe in web as well 2014-01-08 13:59:53 -06:00
Seth Call 03e4dfdc49 * removing wipe commands for now 2014-01-08 18:22:53 +00:00
Seth Call 40480f1484 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 18:04:21 +00:00
Seth Call a400c0f289 * VRFS-971 adding progress at bottom of fotor 2014-01-08 18:04:11 +00:00
Anthony Davis fedea2cdc3 VRFS-923 2014-01-08 07:04:23 -06:00
Anthony Davis 273495698a VRFS-923 wrong sdk/method 2014-01-08 05:51:55 -06:00
Anthony Davis ee5eccfdc3 VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests 2014-01-08 05:10:40 -06:00
Seth Call bffe453a6a * marking sign url test as pending until credentials are provided, and bringing back icecast test 2014-01-08 04:27:56 +00:00
Seth Call 010f41fed0 * marking other icecast test as failing 2014-01-08 03:58:08 +00:00
Seth Call cbac485e7e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 03:42:34 +00:00
Seth Call 89fd0c2995 * VRFS-971- fixed duplicate recorded_tracks being sent as a result of list_downloads; query much more efficient too 2014-01-08 03:28:15 +00:00
jam 8c51eb31db Fix test and make sure icecast is at the bottom of the sql command chain 2014-01-08 01:42:59 +00:00
jam ae1fd60bbf add builder to gems list 2014-01-07 22:27:00 +00:00
jam 2463be1f84 Remove -l arg from bash script 2014-01-07 14:37:22 -06:00
jam 111ab5811a Icecast changes 2014-01-07 14:31:52 -06:00
jam 66558b70e9 Icecast test models 2014-01-07 14:30:06 -06:00
jam 932f59cea6 Icecast models 2014-01-07 14:29:40 -06:00
Anthony Davis 8b3d1abd5c VRFS-923 - pushing a pretend delete. will review Jenkins 2014-01-07 13:40:26 -06:00
Seth Call 8e8e699788 * fixing nil.publish test in mq_router.spec 2014-01-07 16:01:36 +00:00
Seth Call 050af95b56 * fixing more tests 2014-01-06 22:15:02 +00:00
Seth Call 6aba436781 * fixing failing test 2014-01-06 21:51:48 +00:00
Seth Call 45a18c4449 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-06 20:35:41 +00:00
Seth Call fa23c267f5 * VRFS-946 and VRFS-922 - in-session recording features complete 2014-01-06 20:35:35 +00:00
Brian Smith 18d8ff8d3f VRFS-933 notification bug fixes 2014-01-05 16:42:18 -05:00
Seth Call ba3b9ab873 * VRFS-946 - in-session recording 2014-01-05 03:47:23 +00:00
Brian Smith 6dec9a5239 fix tests 2014-01-04 20:25:05 -05:00
Brian Smith fab83707b7 VRFS-933 notification work 2014-01-04 17:02:47 -05:00
Brian Smith 071ab4c0e9 Revert "VRFS-933 fix issues" 
This reverts commit 1b3fdee99e.
 2014-01-04 16:41:21 -05:00
Brian Smith 1b3fdee99e VRFS-933 fix issues 2014-01-04 12:35:15 -05:00
Brian Smith 8b87b11f4d VRFS-933 merge with develop 2014-01-04 12:24:11 -05:00
Brian Smith a2b34d68dd VRFS-933 notification bug fixes 2014-01-04 12:20:28 -05:00
Brian Smith 7ef959782e VRFS-933 notifications 2014-01-04 10:40:21 -05:00
jam 57a9571483 resolve conflict 2014-01-04 08:04:24 -06:00
jam b4260a4ed1 adde icecast file to gem library 2014-01-04 07:40:08 -06:00
Jonathan Kolyer 4c9d2f0c29 vrfs-927: carrierwave integration fixes 2014-01-04 03:10:58 -06:00
Brian Smith 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00
Brian Smith 452ddb3ff0 VRFS-933 more notification work; fixed test failures 2014-01-01 22:06:59 -05:00
Brian Smith 07abf26ced VRFS-933 notification work 2014-01-01 20:02:40 -05:00
Brian Smith 5b31e802d6 VRFS-933 more notification work 2013-12-30 22:35:38 -05:00
Seth Call e4ed571dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-30 18:34:26 +00:00
Seth Call ab70d15eaf * the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks) 2013-12-30 18:34:15 +00:00
Brian Smith 102306e4d1 VRFS-933 notification work 2013-12-29 20:49:44 -05:00
Brian Smith 1806c5245f VRFS-933 notification work 2013-12-29 14:40:21 -05:00
Brian Smith 7e78163bb9 VRFS-933 notification work 2013-12-28 23:51:35 -05:00
Brian Smith 75b9b97c60 fix warning related to ruby- prefix in .ruby-version files 2013-12-27 16:28:28 -05:00
Jonathan Kolyer 7212f20a0f vrfs-927: admin editing buzz promotions 2013-12-22 10:19:39 -06:00
Jonathan Kolyer ec126793c7 vrfs-927: added new promotional table for home page data 2013-12-22 05:22:04 -06:00
Jonathan Kolyer fcd093f5a6 vrfs737: added first_recording_at 2013-12-21 23:23:33 -06:00
Seth Call a68235f280 * adding 'select' to dialog-inner so it'll look JKish 2013-12-20 22:24:14 +00:00
Seth Call 242016c38b * VRFS-821 - recordings manager changes 2013-12-20 22:01:51 +00:00
Jonathan Kolyer 4b3b8491b3 vrfs-916: added favorite_count method 2013-12-18 22:10:55 -06:00
Jonathan Kolyer 4e136659e8 vrfs-916: added following? method 2013-12-18 17:48:55 -06:00
Seth Call 267664d2bf * adding in updated jnlp files 2013-12-17 23:55:10 +00:00
Seth Call d97a960a0e * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:21 +00:00
Brian Smith a1983d9803 VRFS-877 band photo bug fixes 2013-12-16 23:23:59 -05:00
Jonathan Kolyer 60b59a88c7 vrfs-884: fixing tests for commit 2013-12-16 20:32:17 -06:00
Jonathan Kolyer 742402dfa2 vrfs-884: merge conflict fixes 2013-12-16 12:47:59 -06:00
Jonathan Kolyer 196b895f32 vrfs-884: merge conflict 2013-12-16 12:36:41 -06:00
Jonathan Kolyer 65f3200fd7 vrfs-884: added :genres eager loading 2013-12-16 12:23:02 -06:00
Brian Smith d583393598 VRFS-877 bug fixes 2013-12-15 22:53:16 -05:00
Brian Smith 0aaa460934 VRFS-877 band photo work 2013-12-15 16:30:04 -05:00
Brian Smith 5b5aef15c8 VRFS-877 band photo work 2013-12-15 16:27:11 -05:00
Jonathan Kolyer 2a93ce7caf vrfs-884: refactored search filter var names 2013-12-09 13:54:02 -06:00
Jonathan Kolyer 380e264a9a vrfs-884: got band filter specs to work 2013-12-09 11:41:35 -06:00
Jonathan Kolyer 4c804d2f94 vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page 2013-12-09 07:15:59 -06:00
Seth Call 4f97753f47 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-05 11:16:26 +00:00
Seth Call 73087f0f7a * recordings manager - changes to download/upload REST APIs - VRFS-821 2013-12-05 11:16:21 +00:00
Jonathan Kolyer c18848fa03 vtfs-884: cleanup of musicians page prepping for bands page clone 2013-11-29 18:34:00 -06:00
Jonathan Kolyer 7f302a6f0e vrfs-774: removed the like button for results and commented out the message link for compliance with product spec 2013-11-29 15:07:15 -06:00
Brian Smith 4824ca4eb3 VRFS-689 show pending band invitations on Band Profile Members tab 2013-12-01 01:11:23 -05:00
Jonathan Kolyer 1d0b07cbe1 vrfs-775: fixed arg handling in new musicians email 2013-11-27 23:35:16 -06:00
Jonathan Kolyer 4e6c0119ed Merge branch 'musicians_page' into develop 2013-11-27 22:36:28 -06:00
Jonathan Kolyer 01242f3c40 vrfs-775: added comments; minor code tweaks 2013-11-27 22:32:13 -06:00
Brian Smith 71eae1dbb2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-11-27 00:57:56 -05:00
Brian Smith 2cd70405e0 fix bug introduced in create session friend selector 2013-11-27 00:57:49 -05:00
Jonathan Kolyer ece8873e6e Merge branch 'musicians_page' into develop 2013-11-26 09:07:12 -06:00
Jonathan Kolyer 6253b90697 vrfs-775: fixed title to pass test 2013-11-26 09:07:02 -06:00
Jonathan Kolyer 2c30b51048 Merge branch 'musicians_page' into develop 2013-11-26 09:01:08 -06:00
Jonathan Kolyer e57a276144 vrfs-775: added rake task; updating plain text email 2013-11-26 09:00:50 -06:00
Jonathan Kolyer c792b5216a vrfs-775: tuning the new musician email 2013-11-26 08:40:06 -06:00
Jonathan Kolyer cde19cde56 vrfs-775: formatting new musicians email 2013-11-26 03:08:22 -06:00
Jonathan Kolyer ee9b203f99 vrfs-775: integrating new musician emails 2013-11-26 00:03:42 -06:00
Jonathan Kolyer 743048e95b Merge branch 'musicians_page' into develop 2013-11-25 20:46:11 -06:00
Brian Smith 7aeb182f1f VRFS-866 band invitations / notifications 2013-11-26 02:47:56 -05:00
Jonathan Kolyer cc3994e950 Merge branch 'develop' into musicians_page 2013-11-25 15:57:36 -06:00
Jonathan Kolyer 2748588caa testing updates 2013-11-25 15:56:54 -06:00
Brian Smith ff4c25285e VRFS-689 band creation works (minus avatar, form validations, and band invite notifications) 2013-11-23 15:06:42 -05:00
Jonathan Kolyer 1941c65b66 vrfs774: fixed bug in latlng/distance when city param used; added M_MILES_DEFAULT; changed value of PARAM_MUSICIAN 2013-11-23 06:16:40 -06:00
Jonathan Kolyer 58bed4bc04 vrfs774: added musicians_geocoded scope 2013-11-23 06:15:49 -06:00
Jonathan Kolyer d9823eac3a vrfs-774, vrfs-775: refactored tests into smaller it blocks; added contexts 2013-11-23 02:18:12 -06:00
Jonathan Kolyer 543ef29579 vrfs-775: include musicians scope in new_musicians method 2013-11-23 02:04:28 -06:00
Jonathan Kolyer 432e5ad59b vrfs-774: added musicians scope 2013-11-23 01:44:13 -06:00
Jonathan Kolyer 68f6225461 vrfs-774: refactoring tests, using expect syntax over should 2013-11-23 00:04:33 -06:00
Jonathan Kolyer 5b1ea983fa vrfs-774: added upper bound to the per_page param 2013-11-23 00:04:07 -06:00
Jonathan Kolyer c0c6879833 updated rspec version to 2.11 2013-11-23 00:03:22 -06:00
Brian Smith 69bf50ff28 VRFS-689 band setup work 2013-11-21 01:24:40 -05:00
Jonathan Kolyer b1b2a2e360 vrfs-775: added new_musicians method and test 2013-11-17 17:29:23 -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
Seth Call 9805775496 * VRFS-813 - done for this feature 2013-11-16 04:35:40 +00:00
Jonathan Kolyer 555d4f1139 vrfs-774: added orderby for plays/playing; ui tweaks 2013-11-15 16:35:55 -06:00
Jonathan Kolyer 7be8435dc7 vrfs-774: added check for @user_counters in is_{liker,friend,follower}; change M_PER_PAGE to 10 2013-11-15 13:52:53 -06:00
Jonathan Kolyer ac2d4770f5 vrfs-774: added top_followings; removed order_by from user_followings; fixed inverse_likes association typo which used :through => :followings instead of :through => :likes 2013-11-15 13:52:06 -06:00
Jonathan Kolyer a097fdbd98 vrfs-774: fixed broken test; fixed bug editing distance text 2013-11-14 11:56:20 -06:00
Jonathan Kolyer 4e262de50a vrfs-774: fixed counters 2013-11-06 07:50:34 -06:00
Jonathan Kolyer 897e83fd73 vrfs-774: added pagination support; fixed some layout issues 2013-11-06 04:16:47 -06:00
Jonathan Kolyer d33b6d13fb Merge branch 'develop' into musicians_page 2013-11-05 19:14:21 -06:00
Anthony Davis a3dff94f47 MiXeD case email test, I decided the problem was with the test 2013-11-11 23:56:04 -06:00
Jonathan Kolyer a885582bf4 vrfs-774: removed redundant code in user_mappings, and updated test to check user_mappings 2013-11-05 09:07:02 -06:00
Jonathan Kolyer 496b63b68c vrfs-774: updated *_count JSON attributes; added post-search processing for current_user/result likes/follow/friend settings 2013-11-05 08:49:31 -06:00
Jonathan Kolyer 0813c6efd0 vrfs-774: changed search counter names to use search_ prefix; added recording and sessions counters 2013-11-05 06:25:36 -06:00
Jonathan Kolyer 4379ab4283 vrfs-774: replaced User with Search as root search class; added friend counter 2013-11-05 04:14:34 -06:00
Jonathan Kolyer 1893d85e76 vrfs-774: added friend count, followings; sel_str var 2013-11-05 04:13:50 -06:00
Jonathan Kolyer 3329f8067e vrfs-774: added order_by to followings association 2013-11-05 04:13:07 -06:00
Jonathan Kolyer d6e4732604 vrfs-774: musician instrument api search 2013-11-04 10:18:57 -06:00
Jonathan Kolyer a78c57424a vrfs-774: moving search logic into api_search/Search 2013-11-04 08:58:34 -06:00
Jonathan Kolyer 76c1b4ce0a vrfs-774: integrating results with UI 2013-11-04 08:47:30 -06:00
Jonathan Kolyer b809a75e53 vrfs-774: added current_city method 2013-11-03 23:42:41 -06:00
Seth Call db76c34ba5 * VRFS-813 -most all frontend changes needed for start/stop recordings 2013-11-03 14:55:55 -06:00
Jonathan Kolyer ca65a3d50e vrfs-774: fixed inconsistent test failures 2013-11-03 08:08:25 -06:00
Jonathan Kolyer d071ea9381 vrfs-774: added testing for populating user lat/lng when creating a connection 2013-11-03 07:10:21 -06:00
Jonathan Kolyer f164a750c3 vrfs-774: fixed infinite loop issue setting lat/lng 2013-11-03 06:28:52 -06:00
Jonathan Kolyer b48a298af5 merge conflict 2013-11-03 03:16:14 -06:00
Jonathan Kolyer a3ee0eb533 vrfs-774: fixed location-based tests 2013-11-03 02:25:41 -06:00
Jonathan Kolyer fdf213ec66 vrfs-774: updating musician_search logic 2013-11-03 01:52:23 -06:00
Jonathan Kolyer 6f9f72c9b5 vrfs-774: changing country value from USA to US for max_mind_geo support 2013-11-03 01:49:51 -06:00
Jonathan Kolyer d045ae4b53 vrfs-774: geocoding tests 2013-11-03 01:43:09 -05:00
Jonathan Kolyer 6513293969 vrfs-774: fixed max_mind_geo loading 2013-11-02 22:07:16 -05:00
Brian Smith 5e79e34634 added biography to user model 2013-11-02 23:35:18 -04:00
Brian Smith 80086efad2 VRFS-686 band profile members module 2013-11-02 09:59:04 -04:00
Jonathan Kolyer 418f5b5109 vrfs-774: adding back old db col names 2013-11-01 18:42:21 -05:00
Jonathan Kolyer a0cc0f83eb vrfs-774: changed back to old db col names 2013-11-01 18:35:28 -05:00
Jonathan Kolyer ab1645bd4c vrfs-774: put back ip_address_to_int mapping 2013-11-01 18:13:48 -05:00
Jonathan Kolyer e69cd18fe1 vrfs-774: fixed tests 2013-10-28 22:32:58 -05:00
Jonathan Kolyer 9af93fda1e vrfs-774: updating max_mind_geo/users data model for geocoded searches 2013-10-28 21:41:05 -05:00
Jonathan Kolyer 4ccd3b9091 vrfs-774: instrument query filtering 2013-10-28 17:19:36 -05:00
Jonathan Kolyer f6674cfc64 vrfs-774: second musician searches working properly (likers) 2013-10-28 13:44:56 -05:00
Jonathan Kolyer 72d6d4e699 vrfs-774: second musician searches working properly (likers) 2013-10-28 12:21:07 -05:00
Jonathan Kolyer 5d4ab42906 vrfs-774: first musician searches working properly 2013-10-28 12:03:58 -05:00
Jonathan Kolyer fe5dc2c6ab vrfs-774: incremental commit 2013-10-28 09:22:06 -05:00
Jonathan Kolyer fd04b3a7b5 Merge branch 'develop' into musicians_page 2013-10-26 16:03:47 -05:00
Jonathan Kolyer 72e7193e1c vrfs-774: added geokit gems 2013-10-24 12:25:55 -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
Seth Call 32a4297569 * VRFS-780 - finished, tested, etc 2013-10-21 17:13:53 -05:00
Seth Call 482c2cece3 * VRFS-773 - isp page avaible 2013-10-16 11:20:37 -05:00
Jonathan Kolyer ed4d6cc3c6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-15 09:54:28 -05:00
Brian Smith 8f21ead048 VRFS-758 bug fixes 2013-10-16 04:07:30 -04:00
Brian Smith 6dd0df75d9 VRFS-758 join request notification logic 2013-10-16 03:23:43 -04:00
Jonathan Kolyer 6d73d27ed5 vrfs-492: added check for pre-existing MSUH record in self.save 2013-10-15 09:30:43 -05:00
Brian Smith 7b027eff45 updates 2013-10-13 19:57:37 -04:00
Brian Smith 70cba2d98d VRFS-595 session invitations / fix bug with session join notifications arriving twice 2013-10-05 09:04:07 -04:00
Brian Smith 73dcac9a67 VRFS-595 added session invitation notification 2013-10-03 03:16:27 -04:00
Seth Call 79f458d6d5 * VRFS-622 - added search filter 2013-10-01 17:54:53 +00:00
Seth Call 562b93ff4b * adding chris as a devuser 2013-10-01 12:04:17 +00:00
Seth Call f38ca2721a * VRFS-734 - adding all user progression tracking that is possible currently 2013-09-30 02:37:22 +00:00
Jonathan Kolyer edd278575a VRFS-575: reopened ticket: changed relationships of perf_data and ms_user_history; got spec test passing 2013-09-23 19:58:59 -05:00
Seth Call 71710f1ce8 * VRFS-711 - added test to prove that the welcome email comes back after you click signup confirm 2013-09-27 14:54:51 +00:00
Jonathan Kolyer eb079464ab VRFS-575: moved association to perf data from music_session to music_session_user_history; updated admin links for perf data 2013-09-23 12:21:33 -05:00
Seth Call b40e240cd4 * VRFS-711 welcome email added; also, VRFS-725 fixing signout 2013-09-26 17:33:28 +00:00
Seth Call cf907cc060 * VRFS-711 - adding new welcome email with useful links 2013-09-26 13:43:02 +00:00
Seth Call c1ad886c35 * VRFS-699 - support notify_release_stages in the javascript bugsnag 
* VRFS-704 - suppress music sessions with 0 connections find sess api
* VRFS-700 - the find session API does alot better by suppressing empty
             sessions
 2013-09-22 18:56:51 +00:00
Seth Call b4082c88ae * bumping gems to be version 0.1.X to match debs 2013-09-18 20:35:20 +00:00
Seth Call 3d415ec447 * removing more reference to workspace 2013-09-16 02:42:02 +00:00
Seth Call 4d723bacaf * fixing relative paths in gems for develop branch as well 2013-09-16 02:28:44 +00:00
Seth Call 6ea4bae05c merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00