Commit Graph

100 Commits

Author SHA1 Message Date
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
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 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