Commit Graph

124 Commits

Author SHA1 Message Date
Jonathan Kolyer cc3994e950 Merge branch 'develop' into musicians_page 2013-11-25 15:57:36 -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 0eb9ddc4d6 vrfs-774: changed value of Search::PARAM_MUSICISN to srch_m 2013-11-23 06:17:23 -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 69bf50ff28 VRFS-689 band setup work 2013-11-21 01:24:40 -05: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 a8160cca5c vrfs-774: implementing musician search result actions like/follow/friend 2013-11-15 14:03:03 -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 6a62bef3a4 vrfs-774: fixed layout of filtering controls; added is_{following,friend,liker} to results data 2013-11-05 19:13:20 -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 16cddf67d2 vrfs-774: added search tests, ui integration 2013-11-05 04:23:01 -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
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
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
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
Seth Call db76c34ba5 * VRFS-813 -most all frontend changes needed for start/stop recordings 2013-11-03 14:55:55 -06:00
Jonathon Wilson f7aeca4f8f Merge branch 'develop' into ftue_redux 2013-11-03 11:02:08 -07:00
Jonathan Kolyer b48a298af5 merge conflict 2013-11-03 03:16:14 -06: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
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 e1bce5eed8 vrfs-774: impl musician searches 2013-10-28 21:42:36 -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 9e7e905c87 Merge commit 'dcbaf4d329fac3870b64925a8b89a40ff8ec1843' 2013-10-25 07:20:38 -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