Commit Graph

2278 Commits

Author SHA1 Message Date
Daniel Weigh b919dbadd8 VRFS-1136 - fix / tweak infinite scroll
on band and musicians page.
2014-02-18 02:09:31 -05:00
Jonathan Kolyer b822711f1d Merge branch 'develop' into vrfs1110 2014-02-18 00:13:26 -06:00
Brian Smith 61a745398e VRFS-1132 fix visual issues on create session screen 2014-02-18 01:01:14 -05:00
Brian Smith 8a1308381b VRFS-1133 fix issue with musician and fan access dropdowns 2014-02-18 00:33:16 -05:00
Brian Smith ca1c22c058 VRFS-1147 fix genre selection in session settings 2014-02-17 22:39:44 -05:00
Brian Smith e535d0401d VRFS-546 use session settings to preselect band on create session 2014-02-17 22:00:57 -05:00
Daniel Weigh a82a295123 Update utils to new mapping.
Commit: e24cdab262 [e24cdab]
Parents: 348f96f5b0
Author: Brian Smith <briansmith@jamkazam.com>
Date: February 16, 2014 at 9:47:42 PM EST
2014-02-16 22:16:04 -05:00
Daniel Weigh 9c52eea162 * cleanup and a comment to revisit 2014-02-16 20:28:26 -05:00
Brian Smith 348f96f5b0 fix bugs 2014-02-16 17:39:26 -05:00
Brian Smith 83f347e84c merge like/follow refactor and hover bubble work 2014-02-16 16:03:32 -05:00
Brian Smith ebc49b6ccc VRFS-1028 more refactor work 2014-02-16 14:48:54 -05:00
Anthony Davis 60364f3f47 VRFS-1143 - whacking "wtf" message 2014-02-16 12:26:52 -06:00
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Jonathan Kolyer 4dd15d1146 Merge branch 'develop' into vrfs1110 2014-02-16 02:32:53 -06:00
Jonathan Kolyer be7b423426 VRFS-1110 autocompletion ui tweaks 2014-02-16 02:10:17 -06:00
Jonathan Kolyer 0c6cb063e3 VRFS-1110 upgrading to latest version 2014-02-16 01:34:47 -06:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05:00
Brian Smith c173582aa3 more work on like/follow refactor 2014-02-15 20:24:51 -05:00
Seth Call da090bd1a9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 21:33:04 +00:00
Seth Call f5268c43fc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 21:21:25 +00:00
Seth Call 26a8b8013d * VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20 2014-02-15 21:19:03 +00:00
Daniel Weigh 6124cb20fb VFRS-1047 Implement the new landing page.
Carousel in place -- edit slides in users_controller.erb.
At some point, should probably migrate to admin db.

Minor rework to make user/* (web.erb) pages appear correctly in firefox
 -- float issues.

Buzz should work (may need some styling)
Latest is stubbed out.
2014-02-15 16:11:06 -05:00
Seth Call 865d8c17b6 * VRFS-1121 - set dropdown size to 7 2014-02-15 14:24:08 +00:00
Seth Call 7dd0751409 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 23:10:51 -06:00
Seth Call 9f7dfa4fcc * adding in piano to list of instruments 2014-02-14 23:10:39 -06:00
Seth Call 0fbd3543ca * VRFS-1118 fix hidden text problem 2014-02-14 23:41:01 +00:00
Seth Call 694a57bb4a * VRFS-1119 - GA variable not prefixed correctly 2014-02-14 13:27:31 -06:00
Jonathan Kolyer fb3beb3859 VRFS-580 set default SessionSetConnectionStatusRefreshRate to 3 seconds 2014-02-14 08:07:24 -06:00
Jonathan Kolyer 80b042a637 Merge branch 'develop' into vrfs580 2014-02-14 08:06:51 -06:00
Jonathan Kolyer 470150c661 VRFS-580 added calls to SessionSetConnectionStatusRefreshRate for client csTimer 2014-02-14 02:36:10 -06:00
Brian Smith 71385eda04 VRFS-1028 add like / share functionality to session / recording hover bubbles 2014-02-14 02:17:36 -05:00
Brian Smith ca15275a4f fix bug 2014-02-13 22:03:59 -05:00
Brian Smith c8f7141c13 Merge branch 'feature/hover_bubbles' into develop 2014-02-13 20:52:47 -05:00
Brian Smith f6aaa3dcbd VRFS-1028 session / recording hover bubbles 2014-02-13 20:50:56 -05:00
Seth Call 108a9564b6 * adding band create error reporting, better styling of 500 errors, and upping region size 2014-02-13 22:57:48 +00:00
Seth Call b534a1e757 * trying rcov formatter for jenkins integration (VRFS-1103) 2014-02-13 21:17:47 +00:00
Seth Call d20713144e * VRFS-1062 - mostly done. l2m there is an open question on before moving on 2014-02-13 20:17:16 +00:00
Brian Smith eb15b1843b VRFS-1028 session/recording hover work 2014-02-13 14:55:55 -05:00
Seth Call fa37549482 * VRFS-1096 - register volume change callbacks when page loads 2014-02-13 18:54:54 +00:00
Seth Call 763538e136 * VRFS-1095 fixing copy-to-clipboard for share dialog in native client. 2014-02-13 17:51:51 +00:00
Brian Smith 0a94f73d08 VRFS-1028 add hover bubbles throughout app 2014-02-12 23:40:41 -05:00
Brian Smith aac29c3547 VRFS-1028 band hover bubble 2014-02-12 03:12:30 -05:00
Brian Smith 4265ef50b7 VRFS-1028 musician hover bubble 2014-02-12 01:35:44 -05:00
Brian Smith bca7f33400 VRFS-1028 hover bubble work 2014-02-10 23:08:40 -05:00
Jonathan Kolyer 3efe5ab575 VRFS-152 a couple of minor code tweaks before closing this ticket out 2014-02-10 12:12:03 -06:00
Jonathan Kolyer d47d007895 Merge branch 'vrfs152' into develop 2014-02-10 11:54:55 -06:00
Seth Call dc462d804d * VRFS-982 - style with custom easydropdown instead of select element 2014-02-10 22:43:09 +00:00
Jonathan Kolyer 8a469e4943 VRFS-152 fixed sharing with FB auth in place 2014-02-10 11:54:19 -06:00
Brian Smith c1dd3eea75 VRFS-1028 hover bubble work 2014-02-10 08:03:29 -05:00
Seth Call a5d29cc8aa * fix (sign-in) state problem with fb login 2014-02-09 22:39:42 +00:00
Seth Call 2934755d46 * fix (sign-in) state problem with fb login 2014-02-09 22:39:18 +00:00
Seth Call afbe4c09c2 * VRFS-1084-notify working on web layout 2014-02-07 21:44:57 +00:00
Seth Call ff9f132341 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-07 21:28:56 +00:00
Seth Call 7661fc5e39 * VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog 2014-02-07 21:28:47 +00:00
Seth Call e8fe86e504 * VRFS-1083 user_authorizations require user now; found some bugs 2014-02-07 17:18:57 +00:00
Seth Call 7cf866b4b8 * merged 2014-02-07 14:11:24 +00:00
Seth Call b668e54f57 * VRFS-1083 - twitter mostly working; need to deal with edge cases 2014-02-07 14:07:08 +00:00
Brian Smith f7e4a49fa9 VRFS-1020 share dialog 2014-02-07 02:14:34 -05:00
Brian Smith 003b5f8d33 VRFS-1020 display share URL on dialog 2014-02-07 00:57:31 -05:00
Seth Call caa565470d * VRFS-1081 - restyle share dialog 2014-02-06 18:59:19 +00:00
Seth Call 4c39e45708 * merged 2014-02-06 16:35:33 +00:00
Seth Call 17961e676d * VRFS-1077 done 2014-02-06 16:31:52 +00:00
Daniel Weigh dddfb50c45 VRFS-1012 Fix band profile navigation.
forgot a file
2014-02-06 08:07:31 -05:00
Daniel Weigh 77e7b60ca5 VRFS-1012 Fix band profile navigation. 2014-02-06 08:03:44 -05:00
Brian Smith bc305cac5e VRFS-1020 fix share token design 2014-02-06 00:45:48 -05:00
Seth Call 10573fd37a * merged 2014-02-05 11:20:18 +00:00
Brian Smith 3f9bb9bdad VRFS-1020 share dialog work 2014-02-05 02:15:55 -05:00
Brian Smith fbba95856d VRFS-1020 share dialog work 2014-02-05 01:51:26 -05:00
Seth Call eadeb5888f * working on fb integration 2014-02-05 03:17:19 +00:00
Seth Call 0d0ed1de5e * fix share-dialog name 2014-02-05 02:17:52 +00:00
Seth Call a43399a95d * more error handling 2014-02-05 02:12:38 +00:00
Seth Call badeb5ba70 * fix syntax error 2014-02-05 01:58:11 +00:00
Seth Call 669e8e2862 Merge branch 'feature/share_dialog' of bitbucket.org:jamkazam/jam-cloud into feature/share_dialog 2014-02-05 01:55:55 +00:00
Seth Call ca7a69a465 * working on checkboxes 2014-02-05 01:55:51 +00:00
Brian Smith 11fbcc96e7 merge develop 2014-02-04 20:23:08 -05:00
Brian Smith 9e72e6510a merge develop 2014-02-04 20:21:24 -05:00
Seth Call 52f783f70e * fixing another issue with recording id vs claimed recording id 2014-02-04 23:21:34 +00:00
Seth Call c1bee157dd * refactor recordings in the same way 2014-02-04 23:15:12 +00:00
Seth Call ea48b6aa36 * reorging music session page to have most code in JS file 2014-02-04 23:09:13 +00:00
Seth Call fe0c4a374d * adding 'extra_js' block to web layout 2014-02-04 23:00:11 +00:00
Seth Call a25ccf5ced * fixing typo in @music_sessions variable 2014-02-04 22:45:37 +00:00
Seth Call 636ca9b891 * VRFS-1076 - fix for leave session being broken 2014-02-04 21:45:34 +00:00
Seth Call 148009ece5 * VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg 2014-02-04 20:28:00 +00:00
Seth Call 9ce300db56 * fix for welcome.js not being in assets 2014-02-04 19:10:31 +00:00
Seth Call 389b6d5635 * rename it all back to Sharedialog 2014-02-04 18:04:12 +00:00
Seth Call ff8eea553f * finish rename of ShareDialog to ShareSessionDialog 2014-02-04 17:28:49 +00:00
Seth Call ae8b6ebbc7 * renaming all ShareDialog to ShareSessionDialog 2014-02-04 17:05:38 +00:00
Seth Call 5df00b2883 * VRFS-1012-fixing any URLs that don't start with /client 2014-02-04 13:48:13 +00:00
Jonathan Kolyer 0d675b16dc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-04 02:53:04 -06:00
Jonathan Kolyer 5be1742d11 vrfs-1012: changed band profile url back from website to /profile 2014-02-04 02:52:52 -06:00
Jonathan Kolyer 7797b6907c vrfs152: added GA tracking for FB invites 2014-02-04 01:16:16 -06:00
Seth Call d82b0b6fd9 * VRFS-1026 - putting user dropdown back to where it belonged 2014-02-04 02:45:52 +00:00
Seth Call d4a5737c51 * VRFS-1025 finished 2014-02-03 21:19:14 +00:00
Brian Smith 730c315589 Merge branch 'develop' into feature/share_dialog 2014-02-02 18:15:37 -05:00
Brian Smith b7ddd4661a VRFS-1020 share dialog work 2014-02-02 18:14:47 -05:00
Seth Call aa68a4e2f4 * adding welcome.js 2014-02-02 22:25:59 +00:00
Seth Call ef6e3f5fa8 * signup dialog js included now 2014-02-02 21:19:45 +00:00
Seth Call 05e5a8cc11 * working on signup on welcome page 2014-02-02 15:06:41 -06:00
Seth Call 3a5321dc5c * merging manifest and user 2014-01-30 15:53:22 -06:00
Seth Call 6ccfc4cc08 * VRFS-1010 possibly done 2014-01-30 15:51:05 -06:00
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer 1a965b298b vrfs152: integrated fb invites to dropdown 2014-01-29 23:03:12 -06:00
Jonathan Kolyer 13df76e136 vrfs152: added dynamic fetching of facebook invited_user signup url 2014-01-29 22:49:36 -06:00
Brian Smith b457babf79 VRFS-1020 share dialog work 2014-01-29 21:37:36 -05:00
Jonathan Kolyer 7c39c3cd4c vrfs152: integration fb login into view code 2014-01-29 19:55:16 -06:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Daniel Weigh a7f10d8141 VRFS-930 Musician fixes
VRFS-931 Band fixes

Allows for (temporary?) hiding of buttons when FOLLOW is clicked.
2014-01-26 13:44:06 -05:00
Daniel Weigh b98e6439d9 VRFS-930 Musician fixes
"Oops". removed accidentally committed test text.
2014-01-26 13:35:03 -05:00
Daniel Weigh f2d0801908 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 13:26:01 -05:00
Daniel Weigh 31a18a1f95 VRFS-931 Band tweaks 2014-01-26 13:25:19 -05:00
Seth Call ad1521c98b * VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec 2014-01-25 17:38:03 -06:00
Brian Smith 73875a4950 merge develop 2014-01-25 13:26:56 -05:00
Brian Smith dcea238631 VRFS-1020 share dialog work 2014-01-25 10:37:15 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Brian Smith 6d482a034d VRFS-986 more landing page work 2014-01-16 02:50:13 -05:00
Brian Smith 4f9e36a332 VRFS-986 more landing page work 2014-01-16 01:55:36 -05:00
Seth Call 7d90425864 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 22:20:29 +00:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Daniel Weigh 703da937e8 VRFS-930 Musician fixes 2014-01-23 06:10:40 -05:00
Jonathan Kolyer a32697b2e4 vrfs1008: fixed typo 2014-01-14 03:19:21 -06:00
Jonathan Kolyer d2f71dd874 Merge branch 'vrfs1008' into develop 2014-01-14 02:31:48 -06:00
Daniel Weigh b8a51e9f6c VRFS-930 Musician fixes 2014-01-21 21:55:38 -05:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Jonathan Kolyer 91007055a0 vrfs1008: fixed updating invites bug 2014-01-14 02:29:07 -06:00
Jonathan Kolyer ea6391e46e vrfs1008: styled the invite dialog box; fixed bug updating invites 2014-01-14 01:52:22 -06:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Jonathan Kolyer 3c6af2e028 vrfs1008: sending updated invites 2014-01-14 01:31:20 -06:00
Jonathan Kolyer 61a7dcd50f vrfs1008: added existingInvites storage for updates 2014-01-14 01:01:37 -06:00
Jonathan Kolyer cfeed312bf vrfs1008: refactoring 2014-01-14 00:12:00 -06:00
Jonathan Kolyer 28d346fe23 vrfs1008: refactoring, cleanup, bug fixes 2014-01-14 00:02:54 -06:00
Jonathan Kolyer a8b7f3e5a6 vrfs1008: integration bug fixing 2014-01-13 23:18:09 -06:00
Jonathan Kolyer 33c64c2881 vrfs1008: fixing integration bugs 2014-01-13 22:33:32 -06:00
Jonathan Kolyer 11074044a7 vrfs1008: 2014-01-13 19:37:52 -06:00
Jonathan Kolyer 3e2ae677fe vrfs1008: integration with active session 2014-01-13 19:00:42 -06:00
Jonathan Kolyer a923025a80 vrfs1008: changed createInvitations to be anon fcn 2014-01-13 18:35:05 -06:00
Jonathan Kolyer ddcfef56c4 vrfs1008: added hook to external createInvitations function 2014-01-13 14:57:22 -06:00
Jonathan Kolyer d9d240541d vrfs1008: fixing integration of refactoring with createsession 2014-01-13 14:50:56 -06:00
Jonathan Kolyer f3ab5f8297 vrfs1008: createSession invite refactor integration 2014-01-13 10:35:34 -06:00
Jonathan Kolyer 8fdbc7cc08 vrfs1008: refactoring invite logic 2014-01-13 10:11:26 -06:00
Jonathan Kolyer ef01c9a8f1 vrfs1008: moved invite musician html into template for reuse in sessions page 2014-01-13 07:38:47 -06:00
Jonathan Kolyer 68b0fd92d6 vrfs988: updated #query on new search; added semicolons 2014-01-12 02:50:55 -06:00
Jonathan Kolyer 1276c66bd3 vrfs988: fixed sync bugs in searchResults 2014-01-12 02:11:54 -06:00
Jonathan Kolyer af4f03c91e vrfs988: refresh both sidebar and searchResults when search params changed 2014-01-12 02:02:15 -06:00
Jonathan Kolyer ddd1b93420 vrfs988: syncing the search type selections between searchResults and sidebar 2014-01-12 01:53:39 -06:00
Jonathan Kolyer 1a39f6296b vrfs988: changed band url to use website 2014-01-12 01:40:30 -06:00
Jonathan Kolyer da980ce699 vrfs988: refactoring search results; added fans/bands result template handling 2014-01-11 23:34:23 -06:00
Jonathan Kolyer a4816fecfd vrfs988: refactored search results processing 2014-01-11 22:44:58 -06:00
Jonathan Kolyer cdb2b9fab9 vrfs988: sidebar/searchresults 2014-01-11 20:18:20 -06:00
Jonathan Kolyer 2229babf68 vrfs-988: refactoring search as text by entity, rather than site-wide 2014-01-11 06:27:05 -06:00
Seth Call 59bf00a97e * DownloadAvailable proto msg added to help poke client when downloads become available 2014-01-08 21:24:21 +00:00
Seth Call a400c0f289 * VRFS-971 adding progress at bottom of fotor 2014-01-08 18:04:11 +00:00
Brian Smith 76a1d01a66 reformatting 2014-01-07 22:05:36 -05:00
Seth Call e91dbc1388 * removing async:trues in code (because it's default), to make it easier to find async:false 2014-01-08 00:44:56 +00:00
Seth Call 473cb69f6d * VRFS-972 - profile.js changes 2014-01-07 23:30:23 +00:00
Seth Call 9c8bbe9c20 * MUSIC_SESSION_JOIN/DEPART are now SESSION_JOIN/SESSION_DEPART, VRFS-965 2014-01-06 22:34:16 +00:00
Seth Call 8cd679bea1 * VRFS-964 - fixed reconnect button 2014-01-06 21:08:37 +00:00
Seth Call 45a18c4449 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-06 20:35:41 +00:00
Seth Call fa23c267f5 * VRFS-946 and VRFS-922 - in-session recording features complete 2014-01-06 20:35:35 +00:00
Brian Smith 18d8ff8d3f VRFS-933 notification bug fixes 2014-01-05 16:42:18 -05:00
Brian Smith c52e27c7d1 fix race condition on user profile screen 2014-01-05 08:26:24 -05:00
Seth Call 17486c6ed2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-05 03:47:35 +00:00
Seth Call ba3b9ab873 * VRFS-946 - in-session recording 2014-01-05 03:47:23 +00:00
Brian Smith fab83707b7 VRFS-933 notification work 2014-01-04 17:02:47 -05:00
Brian Smith 8b87b11f4d VRFS-933 merge with develop 2014-01-04 12:24:11 -05:00
Brian Smith a2b34d68dd VRFS-933 notification bug fixes 2014-01-04 12:20:28 -05:00
Brian Smith 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00
Daniel Weigh e76244c360 VRFS-940 Change Avatar link borked.
Add in avatar.
2013-12-31 23:24:10 -05:00
Seth Call ab70d15eaf * the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks) 2013-12-30 18:34:15 +00:00
Brian Smith 102306e4d1 VRFS-933 notification work 2013-12-29 20:49:44 -05:00
Brian Smith 1806c5245f VRFS-933 notification work 2013-12-29 14:40:21 -05:00
Brian Smith 7e78163bb9 VRFS-933 notification work 2013-12-28 23:51:35 -05:00
Seth Call a68235f280 * adding 'select' to dialog-inner so it'll look JKish 2013-12-20 22:24:14 +00:00
Daniel Weigh 9c6ccee6f0 VRFS-294 Adjustments to HTML/ CSS. 2013-12-20 07:04:58 -05:00
Jonathan Kolyer 0ecbf9f047 vrfs-916: added toggles for fan/musician; misc fan tweaks 2013-12-18 22:12:28 -06:00
Jonathan Kolyer f7c08ce472 vrfs-916: added fan page branching logic 2013-12-18 17:59:02 -06:00
Brian Smith 56a02a24b2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-18 22:47:34 -05:00
Brian Smith d5b53c3406 remove hard-coded band ID 2013-12-18 22:33:56 -05:00
Seth Call de4a2c8321 * VRFS-821; sending loggedin/loggedout events to backend from frontend 2013-12-18 17:18:23 +00:00
Jonathan Kolyer 3c8dbf4d80 Merge branch 'web_pages' into develop 2013-12-17 11:00:57 -06:00
Jonathan Kolyer 020f9d544e vrfs-884: tweaking layout 2013-12-17 10:59:16 -06:00
Brian Smith 932de5cc35 VRFS-877 band photo bug fixes 2013-12-16 23:22:30 -05:00
Jonathan Kolyer 196b895f32 vrfs-884: merge conflict 2013-12-16 12:36:41 -06:00
Jonathan Kolyer fc6d12e9c8 vrfs-884: band filter page 2013-12-16 12:31:12 -06:00
Brian Smith d583393598 VRFS-877 bug fixes 2013-12-15 22:53:16 -05:00
Brian Smith 5b5aef15c8 VRFS-877 band photo work 2013-12-15 16:27:11 -05:00
Seth Call a30bc2a022 * fix for VRFS-901 - when you remove a track there was a typo in the jamClient reference 2013-12-12 14:57:54 +00:00
Jonathan Kolyer 88f9339fe2 vrfs-884: removed commented code 2013-12-09 13:55:18 -06:00
Brian Smith 833eb45379 VRFS-878 use IP address to default location for band setup 2013-12-08 22:31:49 -05:00
Brian Smith 5856c5d176 VRFS-876 allow user to remove band members 2013-12-07 20:45:24 -05:00
Jonathan Kolyer c18848fa03 vtfs-884: cleanup of musicians page prepping for bands page clone 2013-11-29 18:34:00 -06:00
Jonathan Kolyer 7f302a6f0e vrfs-774: removed the like button for results and commented out the message link for compliance with product spec 2013-11-29 15:07:15 -06:00
Brian Smith cc4f2512bd VRFS-867 bug fixes 2013-12-01 18:16:33 -05:00
Brian Smith 3e1e05e378 VRFS-867 preselect assigned genres when editing band details 2013-12-01 17:53:24 -05:00
Brian Smith 6e180b86d1 VRFS-867 preload location data correctly when editing band details 2013-12-01 16:53:05 -05:00
Brian Smith 95954f4789 VRFS-867 band edit feature 2013-12-01 15:09:44 -05:00
Brian Smith 63a5559689 VRFS-689 integrate email / Google+ invitation dialog 2013-12-01 01:25:01 -05:00
Brian Smith 4824ca4eb3 VRFS-689 show pending band invitations on Band Profile Members tab 2013-12-01 01:11:23 -05:00
Brian Smith 419ff2793d VRFS-689 reset form when cancelling setup 2013-11-30 16:35:22 -05:00
Brian Smith 4fadedb04b VRFS-689 added validations for required fields 2013-11-30 16:19:20 -05:00
Brian Smith 37c571d9ea VRFS-689 city/state/country dropdowns should be dynamic using REST API 2013-11-28 00:36:32 -05:00
Brian Smith 2cd70405e0 fix bug introduced in create session friend selector 2013-11-27 00:57:49 -05:00
Jonathan Kolyer 743048e95b Merge branch 'musicians_page' into develop 2013-11-25 20:46:11 -06:00
Brian Smith 7aeb182f1f VRFS-866 band invitations / notifications 2013-11-26 02:47:56 -05:00
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
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 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 550a1ae6df * VRFS-798 - close connection if a heartbeat can not be correlated to a connection, or memory state 2013-10-23 15:46:30 +00:00
Seth Call aff6df7028 * VRFS-797; don't allow the add track handler to be registered > 1 times 2013-10-23 14:59:18 +00:00
Seth Call a632682d16 * VRFS-791; making footer invisible until it's styled; only to make it possible to test that it's showing or not 2013-10-22 19:51:47 -05:00
Seth Call efa0f064f9 * VRFS-791 - fix with no test 2013-10-22 19:37:20 -05:00
Seth Call 2d28227b9f * VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes 2013-10-22 14:27:20 -05:00
Seth Call 7812970343 * VRFS-778; defining all possible images for download page in template, so that rails precompile error is avoided 2013-10-22 13:03:37 -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 7492315f3a * VRFS-776 - home screen updated for new spec for native client; no more disable of create/find tiles 2013-10-19 16:02:27 -05:00
Seth Call 481514e301 * VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable 2013-10-19 14:46:06 -05:00
Seth Call 33ce8f2959 * VRFS-789 - updated favicon in. still need to update nginx recipe via chef 2013-10-19 13:50:19 -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
Brian Smith 17c7e73894 VRFS-727 fix syntax error in selector resulting in duplicate friend list 2013-10-14 22:25:15 -04:00
Brian Smith ecd247c1f7 VRFS-705 fix issue with input disappearing 2013-10-13 21:01:44 -04:00
Brian Smith e0cfe9cb6e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-13 19:57:42 -04:00
Brian Smith 7b027eff45 updates 2013-10-13 19:57:37 -04:00
Jonathon Wilson daaf1ca01f Remove unnecessary call. 2013-10-12 16:38:55 -06:00
Jonathon Wilson d741d293c8 VRFS-293. Respond to connection status changes. 2013-10-12 16:35:12 -06:00
Jonathon Wilson 6ddab3926c Merge branch 'develop' into vrfs-293 2013-10-12 15:45:20 -06:00
Jonathon Wilson e6c2f78f83 Start of connection indicators. Cleanup CSS. 2013-10-09 19:56:04 -06:00
Seth Call 035a1213d7 Merge branch 'develop' 2013-10-08 10:19:43 -05:00
Seth Call f193e3f325 * VRFS-766 - fixed broken footer links in landing pages 2013-10-08 16:05:19 -05:00
Seth Call 6472fa95ad * adding log statement to TrackGetDevices in the configure tracks dialog 2013-10-06 13:36:25 +00:00
Brian Smith 2dc5e4073e VRFS-640 Find Session filter changes 2013-10-06 01:22:28 -04:00
Jonathon Wilson f4fe19809d VRFS-583. Visually reflect mute state from peers 2013-10-05 12:24:22 -06:00
Brian Smith 7e2d4cc739 fix syntax error 2013-10-05 10:33:51 -04:00
Brian Smith 70cba2d98d VRFS-595 session invitations / fix bug with session join notifications arriving twice 2013-10-05 09:04:07 -04:00
Brian Smith 28d9ae3f34 VRFS-755 fix javascript error 2013-10-04 13:32:23 -04:00
Brian Smith 6192a1f20c VRFS-595 fix format of session invitation notification 2013-10-03 08:51:25 -04:00
Brian Smith 0f70fe2eb2 VRFS-755 fix issue with undefined session invitations 2013-10-03 08:09:31 -04:00
Brian Smith 73dcac9a67 VRFS-595 added session invitation notification 2013-10-03 03:16:27 -04:00
Seth Call e4e1ed7459 * VRFS-718 fix for undefined count 2013-10-03 01:39:32 +00:00
Seth Call f5d4708d1d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-03 01:08:38 +00:00
Seth Call a93ca91df1 * make loop in sending emails slower for VRFS-748; also click against double-execution of sendEmail 2013-10-03 00:51:19 +00:00
Jonathon Wilson 1183b247c1 VRFS-721. Limit no-control-panel check to windows only for non-asio. 2013-10-02 17:43:37 -06:00
Seth Call c1479081ff * VRFS-747 - hm. curious. I must not have added the necessary events at any time, meaning this never really worked for the sidebra 2013-10-02 21:32:57 +00:00
Jonathon Wilson 723b53676a Set in/out buffers to 1 for non-ASIO device 2013-10-01 22:24:38 -06:00
Jonathon Wilson a57083bd09 VRFS-721. Syntax error fixes in ga.js 2013-10-01 21:27:53 -06:00
Seth Call 2e27773511 * VRFS-734 some tests for downloading 2013-10-01 20:20:33 +00:00
Seth Call 79f458d6d5 * VRFS-622 - added search filter 2013-10-01 17:54:53 +00:00
Seth Call f38ca2721a * VRFS-734 - adding all user progression tracking that is possible currently 2013-09-30 02:37:22 +00:00
Seth Call 6518e3a009 * adding 2 custom variables for , UserType and UserLevel, but so far it's not showing up. can't tell if it's due to a GA delay 2013-09-28 18:41:19 +00:00
Seth Call 81c37d131f * VRFS-709 - google analytics -- tracking friend connect request and accept. also tracking all tile changes as virtualpage views 2013-09-27 21:39:51 +00:00
Seth Call 7affb449be * VRFS-709 - added FindSession category 2013-09-27 15:33:52 +00:00
Seth Call a0a90a0eeb * VRFS-710 tests 2013-09-27 02:45:40 +00:00
Seth Call b40e240cd4 * VRFS-711 welcome email added; also, VRFS-725 fixing signout 2013-09-26 17:33:28 +00:00
jam b5cd965089 Add callback to register user name 2013-09-24 02:22:41 -05:00
Seth Call c8afc20e35 * VRFS-710 manually tested 2013-09-25 15:56:22 +00:00
Seth Call d3d38e9919 * VRFS-710 getting invite row at bottom 2013-09-25 15:46:00 +00:00
Seth Call 3b0376c1da * forgot bundle update on ruby 2013-09-25 15:43:40 +00:00
Seth Call 34ccc3a540 * adding helper scripts 2013-09-25 15:34:53 +00:00
Seth Call d3fee152e1 * VRFS-709 - SessionCount, SessionMusicions, and JoinInvitatations added 2013-09-24 21:23:11 +00:00
Seth Call 72b4aa969e * VRFS-709 - Audio Qualication instrumented 2013-09-23 22:49:44 +00:00
Seth Call 9c426fc5a7 * VRFS-709 - track client downloads 2013-09-23 21:32:37 +00:00
Seth Call 3c69988d1d * VRFS-709 - registrations tracked 2013-09-23 21:00:39 +00:00
Seth Call 6c3958dc9f * VRFS-706 - changing signature to FTUERegistryVUCallbacks to call 3 empty strings, not 1, to unregister 2013-09-22 22:35:23 +00:00
Seth Call c1ad886c35 * VRFS-699 - support notify_release_stages in the javascript bugsnag
* VRFS-704 - suppress music sessions with 0 connections find sess api
* VRFS-700 - the find session API does alot better by suppressing empty
             sessions
2013-09-22 18:56:51 +00:00
Seth Call b7a20555d2 * VRFS-698 - if an ACK has been seen for an heartbeat, don't check for a disconnect on the client; only while we have sent a heartbeat but haven't seen an ACK for it 2013-09-22 13:21:10 +00:00
Seth Call 022085c8c8 * VRFS-699 bugsnag added to javascript 2013-09-22 01:25:20 +00:00
Seth Call e277f4d282 * VRFS-581; adding spinner, indication of no sessions are found, and also removing synchronous ajax 2013-09-21 03:43:56 +00:00
Seth Call 5b3d1aca5a * missed trailing brace 2013-09-20 17:49:48 +00:00
Seth Call da7a28a81e * revert latest change regarding configuration of tracks 2013-09-20 17:46:36 +00:00
Brian Smith decd478388 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-19 23:16:47 -04:00
Brian Smith 533874afdf merge 2013-09-19 23:16:36 -04:00
Seth Call e95b0a9594 * flip the colors of the progress steps to make more sense VRFS-696 2013-09-20 03:10:24 +00:00
Brian Smith 775577d4fa VRFS-697 configure track bug - possible fix 2013-09-19 23:08:28 -04:00
Seth Call 03acb21428 * VRFS-696 - support new callbacks to update UI as application updates. also suppress websocket-connection popup if updating 2013-09-20 03:02:32 +00:00
Brian Smith 62fb0820b0 VRFS-657 force user to accept terms when joining an existing session 2013-09-17 23:09:49 -04:00
Brian Smith 99774759cc VRFS-677 mark chat devices as unassigned 2013-09-17 00:06:31 -04:00
Jonathon Wilson 1d36dcb88f VRFS-648. Use Peter's new resync function instead of FTUESave. 2013-09-15 19:55:12 -06:00
Seth Call 2f41675471 merging jam-web into web 2013-09-15 18:04:37 +00:00