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 |
|
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
|
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
|
5b1ea983fa
|
vrfs-774: added upper bound to the per_page param
|
2013-11-23 00:04:07 -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
|
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
|
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
|
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
|
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
|
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 |
|
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 |