Commit Graph

2075 Commits

Author SHA1 Message Date
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
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 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
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
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
Jonathan Kolyer fe5dc2c6ab vrfs-774: incremental commit 2013-10-28 09:22:06 -05:00
Brian Smith 5beddc7a85 VRFS-76 band profile work 2013-10-27 21:50:31 -04:00
Brian Smith a6c1b0d79d VRFS-76 band profile work 2013-10-27 19:53:49 -04:00
Brian Smith 3fd187c88f VRFS-595 retrieve session when Join is clicked to check for modified session settings 2013-10-27 15:07:26 -04:00
Brian Smith a0d8c1e1b5 VRFS-76 initial dev for band feature 2013-10-27 13:02:41 -04:00
Jonathan Kolyer fd04b3a7b5 Merge branch 'develop' into musicians_page 2013-10-26 16:03:47 -05:00
Brian Smith 86ccc55ee5 VRFS-782 fix bug with track 2 instrument icon 2013-10-26 10:39:22 -04:00
Brian Smith a875c98a9b VRFS-782 removed settings gear on each track / allow track 2 input to be empty now 2013-10-26 09:38:03 -04:00
Brian Smith dea3a37652 VRFS-782 consolidate add/configure track dialogs 2013-10-25 21:34:40 -04:00
Seth Call 77d38a41a8 * I can't keep straight what's pending and what's not 2013-10-24 14:59:21 -05:00
Seth Call 3afeb75297 * fixing path for /client prefix 2013-10-24 14:57:58 -05:00
Seth Call 087d4e62c5 * music_session_spec fails too much on build server. marking pending for all ests 2013-10-24 13:27:11 -05:00
Seth Call 48f7441bb3 * music_session_spec fails too much on build server. marking pending for all ests 2013-10-24 13:24:06 -05:00
Jonathan Kolyer 2a76abccf4 vrfs-492: disabled tests to avoid build failures 2013-10-24 12:40:02 -05:00
Jonathan Kolyer fec91d1e99 merge conflict 2013-10-24 12:29:37 -05:00
Jonathan Kolyer 72e7193e1c vrfs-774: added geokit gems 2013-10-24 12:25:55 -05:00
Jonathan Kolyer 362b60cbe9 vrfs-774: musicians page 2013-10-24 12:25:27 -05:00
Seth Call dcbaf4d329 * VRFS-644 using icheck methods to set check/uncheck status 2013-10-23 13:45:46 -05:00
Seth Call e0c542efae * VRFS-644 unchecking intellectual property the 'icheck' way for case when you re-enter create session screen after a previous successful create session atempt 2013-10-23 11:57:38 -05:00
Seth Call e843989e76 * VRFS-644 jamkazam custom png added 2013-10-23 11:39:49 -05:00
Seth Call 299d24e992 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-23 11:32:31 -05:00
Seth Call 690c547c09 * VRFS-644 - these checkboxes/radio buttons using icheck work on normal browser; switching to windows to test 2013-10-23 11:32:15 -05:00
Seth Call 362a76653d * VRFS-796 - fixed by removing email_confirmed restirction on show/index user APIs 2013-10-23 16:22:15 +00:00