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
|
114daf2818
|
vrfs-774: replaced raw HTML with rails helpers
|
2013-11-23 16:54:01 -06:00 |
|
Jonathan Kolyer
|
b50c46dd32
|
vrfs-774: converted raw html into rails helpers
|
2013-11-23 16:25:27 -06:00 |
Brian Smith
|
2586601a17
|
fix test
|
2013-11-23 15:38:34 -05: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
|
9efefb485e
|
vrfs-774: refactored api tests; added geocoding support
|
2013-11-23 06:17:58 -06:00 |
|
Jonathan Kolyer
|
0eb9ddc4d6
|
vrfs-774: changed value of Search::PARAM_MUSICISN to srch_m
|
2013-11-23 06:17:23 -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
|
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
|
205d90e25b
|
VRFS-689 only show band setup link if user is on his own profile
|
2013-11-22 00:16:03 -05:00 |
|
Brian Smith
|
92d9999719
|
VRFS-689 add links on Profile Band tab to set up band
|
2013-11-21 22:12:08 -05:00 |
|
Brian Smith
|
5b21a8b1b8
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-11-21 01:24:53 -05: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 |
|
Jonathan Kolyer
|
a8f68c6396
|
Merge branch 'develop' into musicians_page
|
2013-11-16 15:10:39 -06:00 |
|
Jonathan Kolyer
|
9265a2c413
|
vrfs-774: fixed styles in musician page
|
2013-11-16 15:10:11 -06:00 |
 Seth Call
|
f74ef61965
|
* trying reset sessions
|
2013-11-16 19:35:01 +00:00 |
|
Seth Call
|
7f4c15ea87
|
* fixing recording feature tests
|
2013-11-16 18:51:54 +00:00 |
|
Seth Call
|
9c9c427b75
|
* VRFS-852 fixed
|
2013-11-16 15:36:23 +00: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
|
a8160cca5c
|
vrfs-774: implementing musician search result actions like/follow/friend
|
2013-11-15 14:03:03 -06:00 |
|
Jonathan Kolyer
|
673507458c
|
vrfs-774: changed blank search critieria to allow multiple results
|
2013-11-15 13:54:54 -06:00 |
|
Jonathan Kolyer
|
2783336e65
|
vrfs-774: changed city for Kolyer to Austin
|
2013-11-15 13:53:34 -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
|
2c7d7bb5a4
|
Merge branch 'develop' into musicians_page
|
2013-11-14 11:57:05 -06:00 |
|
Jonathan Kolyer
|
a097fdbd98
|
vrfs-774: fixed broken test; fixed bug editing distance text
|
2013-11-14 11:56:20 -06:00 |
Anthony Davis
|
ecdc5dfe05
|
Build failing, out of memory. Disabling the four-client test
|
2013-11-13 08:35:26 -06:00 |
|
Anthony Davis
|
cd912c9b48
|
VRFS-850 adding integration tests and refactoring utilities.
|
2013-11-13 00:58:28 -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 |
|
Anthony Davis
|
64509f8592
|
VRFS-829 + adding "in session" tests. will watch Jenkins...
|
2013-11-11 22:57:04 -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 |
|
Jonathan Kolyer
|
6a62bef3a4
|
vrfs-774: fixed layout of filtering controls; added is_{following,friend,liker} to results data
|
2013-11-05 19:13:20 -06:00 |
|
Seth Call
|
826f89d4f3
|
* working through all the dependency issues with admin
|
2013-11-05 20:10:59 +00:00 |
|
Anthony Davis
|
250933490b
|
removing 'unf' in admin Gemfile in case it's breaking the build
|
2013-11-05 22:21:12 -06:00 |
|
Brian Smith
|
5370f8853b
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-11-05 22:14:38 -05:00 |
|
Brian Smith
|
e40b26d919
|
VRFS-837 check for undefined session
|
2013-11-05 22:14:30 -05:00 |
|
Seth Call
|
297bce049d
|
* working through all the various dependency issues of admin project
|
2013-11-05 20:06:38 +00: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 |