Jonathan Kolyer
|
462e4034ec
|
vrfs-774: changed Montana to MT for geocoding
|
2013-11-04 01:45:19 -06:00 |
|
Jonathan Kolyer
|
a8dbca3552
|
Merge branch 'develop' into musicians_page
|
2013-11-03 23:43:21 -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 |
|
Brian Smith
|
e2c59d6543
|
VRFS-687 fix issue with band profile social tab, added logging
|
2013-11-04 22:53:44 -05:00 |
|
Seth Call
|
21b338a5ea
|
* merged
|
2013-11-05 03:02:42 +00:00 |
Jonathon Wilson
|
a544aba19a
|
Merge branch 'develop' into ftue_redux
|
2013-11-05 19:51:30 -07:00 |
|
Jonathon Wilson
|
c6802c4e40
|
New FTUE: Prevent save if bad or unknown latency. If unknown, link to old FTUE.
|
2013-11-05 19:50:32 -07:00 |
|
Anthony Davis
|
cfb6a6133f
|
adding optional 'fog' dependency 'unf' to suppress warnings
|
2013-11-05 20:03:43 -06:00 |
|
Jonathon Wilson
|
1aeb358d29
|
Add proper showing of FTUE on Create/Join session if id hasn't been done.
|
2013-11-05 15:44:40 -07:00 |
|
Jonathon Wilson
|
443593a9ee
|
New FTUE. Cancel and Save buttons working with notification if you haven't selected an audio device.
|
2013-11-04 20:26:24 -07:00 |
|
Seth Call
|
6198bccf3b
|
* refactoring relavent tests to use create_session/find_session utility
|
2013-11-05 03:00:43 +00:00 |
|
Jonathon Wilson
|
36b561e9a5
|
Merge branch 'develop' into ftue_redux
|
2013-11-04 19:26:41 -07:00 |
|
Jonathan Kolyer
|
b809a75e53
|
vrfs-774: added current_city method
|
2013-11-03 23:42:41 -06:00 |
|
Jonathan Kolyer
|
f192bb8d56
|
vrfs-774: incremental ui edits
|
2013-11-03 23:42:02 -06:00 |
|
Jonathon Wilson
|
f7aeca4f8f
|
Merge branch 'develop' into ftue_redux
|
2013-11-03 11:02:08 -07: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 |
|
Seth Call
|
aea3434d02
|
* VRFS-831 - looks finished
|
2013-11-03 15:23:46 -06:00 |
|
Jonathan Kolyer
|
2b19744683
|
vrfs-774: replaced original max_geo_isp db cols
|
2013-11-03 02:45:54 -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
|
291a3a8ac2
|
vrfs-774: changing country value from USA to US for max_mind_geo support
|
2013-11-03 01:49:10 -06:00 |
|
Jonathan Kolyer
|
d045ae4b53
|
vrfs-774: geocoding tests
|
2013-11-03 01:43:09 -05:00 |
|
Brian Smith
|
5e79e34634
|
added biography to user model
|
2013-11-02 23:35:18 -04:00 |
|
Jonathan Kolyer
|
6513293969
|
vrfs-774: fixed max_mind_geo loading
|
2013-11-02 22:07:16 -05:00 |
|
Seth Call
|
2481172acb
|
* VRFS-831 - moving to other machine. can't tell if my mac is being strange atm
|
2013-11-02 20:54:32 +00:00 |
|
Brian Smith
|
80086efad2
|
VRFS-686 band profile members module
|
2013-11-02 09:59:04 -04:00 |
|
Brian Smith
|
d063ba2a37
|
VRFS-819 VRFS-76 band profile updates
|
2013-11-02 02:10:35 -04:00 |
|
Brian Smith
|
cb44901c03
|
Merge branch 'feature/vrfs_76_bands' into develop
|
2013-11-01 21:48:41 -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 |
|
Jonathon Wilson
|
33eed269ed
|
New FTUE panel controls mostly working.
|
2013-10-31 12:08:05 -06:00 |
|
Brian Smith
|
f93685aaff
|
VRFS-782 fix validation bug
|
2013-10-29 01:30:51 -04:00 |
|
Jonathan Kolyer
|
e69cd18fe1
|
vrfs-774: fixed tests
|
2013-10-28 22:32:58 -05:00 |
|
Jonathan Kolyer
|
9f09674d77
|
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
|
2013-10-28 21:44:14 -05:00 |
|
Jonathan Kolyer
|
e1bce5eed8
|
vrfs-774: impl musician searches
|
2013-10-28 21:42:36 -05:00 |
|
Jonathan Kolyer
|
dd5be13e9f
|
vrfs-774: updated max_mind_geo/users table for geocoded searches
|
2013-10-28 21:41:52 -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 |