Commit Graph

2306 Commits

Author SHA1 Message Date
Brian Smith 08d8d86fc6 VRFS-1635 auto-select the FB checkbox after successfully signing in to Facebook 2014-07-21 01:36:57 -04:00
Seth Call 513a46067a * merged 2014-07-19 21:12:11 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Brian Smith 32a16c4dcb fix test 2014-07-16 20:30:33 -04:00
Bert Owen 5027000c49 VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP 2014-07-16 20:19:43 +02:00
Bert Owen 662b668d87 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-16 18:21:37 +02:00
Bert Owen 590e6d8028 VRFS-1926 fixed, fix scheduled session query 2014-07-16 18:21:21 +02:00
Brian Smith 8f62216dbe Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-16 01:21:12 -04:00
Brian Smith 7555d8b65a VRFS-1892 refresh only the affected session row when updating RSVPs 2014-07-16 01:20:59 -04:00
Bert Owen db06226cd9 VRFS-1923 Implement spinner when fetching scheduled sessions on create session screen 2014-07-15 00:34:36 +02:00
Bert Owen 26f7d2755b VRFS-1918 Session Details Update Screen - once over with tests 2014-07-14 20:40:00 +02:00
Brian Smith 34a6843616 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-13 22:02:59 -04:00
Brian Smith f06018817f VRFS-1916 Find Session formatting wip 2014-07-13 22:02:50 -04:00
Seth Call cc7fb9e0ac Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-13 13:20:40 -05:00
Seth Call 0ea1ef49b8 * VRFS-1919 - guard against old clients and new RegisterShutdown callback 2014-07-13 13:20:30 -05:00
Brian Smith 6b00538436 miscellaneous formatting fixes 2014-07-13 13:36:56 -04:00
Seth Call e59bb6e68c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-12 22:08:50 -05:00
Seth Call f065a913a4 * VRFS-1895 - re-entering create session works 2014-07-12 21:59:07 -05:00
Brian Smith 1c32702bba VRFS-1915 fixed Find Session bug where first session in each section was not being cleared out when refreshing the list resulting in duplicates 2014-07-12 18:34:06 -04:00
Brian Smith a7621b0326 VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification 2014-07-12 18:24:12 -04:00
Seth Call 6970edb44c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-12 15:28:44 -05:00
Seth Call 0b138a3abc * VRFS-1867 - default the timezone using jstz library; VRFS-1870 - cancel dialog styling fixes 2014-07-12 15:28:20 -05:00
Anthony Davis 63b2a30466 VRFS-1914 - invalid extensions are not uploaded 2014-07-12 15:16:07 -05:00
Seth Call 14dad29c59 * VRFS-1861 - show something useful in the session section of the account screen 2014-07-12 08:55:58 -05:00
Seth Call b7683a1931 * VRFS-1876 - added details to the sesison info page 2014-07-11 22:22:15 -05:00
Seth Call 32baa4ad7d * VRFS-1911 mostly done exception for emails and notifications 2014-07-11 21:38:59 -05:00
Seth Call d47218961e * working on formatting still 2014-07-11 21:11:34 -05:00
Seth Call 014a423a3d * VRFS-1860 - account screen lists by date; VRFS-1911 partially done (using proper date formatting) 2014-07-11 17:21:55 -05:00
Seth Call afa2fa58cf * VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user 2014-07-10 15:57:48 -05:00
Seth Call f693470c63 * VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model 2014-07-10 15:22:00 -05:00
Seth Call deff00292a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-10 11:00:26 -05:00
Seth Call 131b397f80 * background log 2014-07-10 11:00:23 -05:00
Seth Call ec467186dd * VRFS-1907 fix for latency tester 2014-07-10 10:45:08 -05:00
Brian Smith 0041562933 VRFS-1419 VRFS-1906 do not delete music session when canceling because it leaves dangling notifications / added paging support for Find Session screen 2014-07-10 00:39:38 -04:00
Seth Call e47d8c1abb * VRFS-1832 - making dialogs work everywhere 2014-07-09 17:20:20 -05:00
Seth Call 73d2d537da * VRFS-1832 - dialogs refactored to a very large degree; want to get all the file moves in now 2014-07-09 14:10:42 -05:00
Seth Call 0000932789 * VRFS-1901 - hook up wired pth 2014-07-09 10:18:29 -05:00
Seth Call c043cffc72 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-08 21:14:50 -05:00
Seth Call 2905372451 * VRFS-1809 - change to _default and copy instruments 2014-07-08 21:14:40 -05:00
Anthony Davis b6fa32e764 VRFS-1878 - fixing file extension bug and updating error message 2014-07-08 20:15:04 -05:00
Seth Call 71737f3f5e * VRFS-1879 - handle case of no instruments selected for others; VRFS-1894 - canceled RSVPs that have not been dealt with are not shown 2014-07-08 16:52:25 -05:00
Seth Call e9cd2e14f9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-08 13:34:07 -05:00
Seth Call 0020a8eb0d * VRFS-1889 completed; VRFS-1879 - partially done 2014-07-08 13:34:03 -05:00
Bert Owen 2bad833e58 fix session detail spec, fix session detail approve/cancel rsvp request actions 2014-07-08 17:47:46 +02:00
Seth Call 27fe4f4ae9 * VRFS-1880 - fixed issue and added test 2014-07-07 16:08:36 -05:00
Seth Call 23547b26b4 * VRFS-1871 - stopping double-redraw of dropdown 2014-07-07 09:59:39 -05:00
Brian Smith 71c22417d4 VRFS-1823 allow anonymous users to view session info page 2014-07-06 23:07:58 -04:00
Brian Smith 627a403009 VRFS-1875 fix action button for RSVP notification 2014-07-06 16:15:39 -04:00
Brian Smith 4872c037ad added field to approved_rsvps method per request from Bert 2014-07-05 21:51:45 -04:00
Brian Smith 1975233e57 VRFS-1858 show friendly message if date is not defined for future sessions 2014-07-05 21:13:35 -04:00
Bert Owen f5e5c3c07f Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-05 17:22:35 +02:00
Bert Owen eee37a5954 fix account session detail page 2014-07-05 17:21:55 +02:00
Seth Call 5b8fd14088 * pin jquery-ui-rails to 4.2.1 2014-07-03 20:39:26 -05:00
Seth Call 3f53cb9819 * removing jquery draggable from web and landing 2014-07-03 17:53:16 -05:00
Seth Call 2ceb50f7c2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-03 16:27:00 -05:00
Seth Call de1ca28623 * VRFS-1680 - incorporate LeaveSessionAndMinimize bridge call on 'background' selection 2014-07-03 16:26:53 -05:00
Brian Smith 4e1a68f344 VRFS-1855 fixed Create / Find Session issues related to open RSVPs 2014-07-03 00:51:54 -04:00
Bert Owen af901f9241 merge 2014-07-02 22:48:02 +02:00
Seth Call bd910abee9 * VRFS-1680 - working mostly... but the backgrounding isn't yet working when selected 2014-07-02 15:43:38 -05:00
Bert Owen d6f26b6cd6 fix tests 2014-07-02 22:43:04 +02:00
Bert Owen 421d183ba3 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-02 15:57:55 +02:00
Bert Owen 2ced001f77 add account scheduled session properties page, add spec, fix detail page, create session flow 2014-07-02 15:57:18 +02:00
Seth Call 1e4e9bd90e * VRFS-1804 - 'prime the pump' stage done 2014-07-01 21:01:47 -05:00
Seth Call 6cee38df70 * remove debug 2014-07-01 15:05:19 -05:00
Seth Call c58cd234e7 * VRFS-1811 - use step 2's selected inputs to populate track assignments 2014-07-01 15:02:30 -05:00
Seth Call 64b25e4b5f * VRFS-1810 - bring back in_session_spec test, VRFS-1834 - allow different genres to be used by GenreSelectorHelpor 2014-07-01 14:30:38 -05:00
Seth Call 6e31e3b06c * VRFS-1830 - only dismiss launch-app on dialog close 2014-07-01 14:12:55 -05:00
Seth Call 7dcf205a6b * VRFS-1821 - clarify error message on music notation fail 2014-07-01 13:58:58 -05:00
Seth Call 726122041d * VRFS-1819 - datepicker has arrows back,and lighter theme 2014-07-01 11:48:56 -05:00
Seth Call d4c78903ca * VRFS-1813 - added in all the help links for the gear wizard 2014-07-01 11:07:49 -05:00
Brian Smith b0011137b9 VRFS-1827 add Fan Page URL to session info page 2014-07-01 00:44:10 -04:00
Brian Smith 0ece384569 VRFS-1828 VRFS-1829 add date/time info to Find Session screen, fix RSVP dialog issues 2014-07-01 00:36:06 -04:00
Seth Call 2041b8b660 * VRFS-1814 - end time updated automatically to an hour after 2014-06-30 17:12:00 -05:00
Seth Call eccd166a47 * VRFS-1815 - remove dead space from friends dialog 2014-06-30 16:34:00 -05:00
Seth Call 63dfb8929c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-30 15:44:38 -05:00
Seth Call cbe4bf1747 * VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed 2014-06-30 15:44:28 -05:00
Jonathan Kolyer c95bebef48 VRFS-1458 fixed location selection 2014-06-30 03:13:40 +00:00
Brian Smith 6c05fb5ad1 VRFS-1812 refactor latency indicators to retrieve them after a websocket connection has been established; fixes broken tests 2014-06-29 22:08:30 -04:00
Brian Smith 98febc2b4f VRFS-1729 expose new JS function 2014-06-29 20:10:00 -04:00
Brian Smith bf6bf3ac98 VRFS-1729 added JS function to support RSVP approve/decline on Session Details screen 2014-06-29 17:35:18 -04:00
Bert Owen 156095f3c8 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-06-29 15:55:18 +02:00
Bert Owen 07d96d7a57 VRFS-1667, VRFS-1729 implemented account session page, session detail page 2014-06-29 15:54:51 +02:00
Brian Smith 287faa765c VRFS-1812 added latency indicators to the session info page 2014-06-28 13:06:32 -04:00
Seth Call b130818011 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-27 14:18:09 -05:00
Seth Call 865b488f93 * VRFS-304 - user history (feed) tab 2014-06-27 14:17:56 -05:00
Brian Smith 3b6a65eec2 VRFS-1820 fix latency indicator alignment issues 2014-06-27 01:53:33 -04:00
Brian Smith 79dc9c37c2 VRFS-1820 fixed aesthetic issues 2014-06-26 23:28:59 -04:00
Brian Smith eb30ee3391 VRFS-1672 music notation file upload work 2014-06-26 23:07:48 -04:00
Seth Call 09364fc25b * refactor feed logic into a 'helper', to prepare for VRFS-304 2014-06-26 07:23:27 -05:00
Brian Smith 15fca431ed Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-26 07:49:59 -04:00
Brian Smith cfb65548da fix test 2014-06-26 07:49:49 -04:00
Seth Call 3be30ad806 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-25 21:52:59 -05:00
Seth Call f9ce995a8f * tweak date offset logic 2014-06-25 21:50:20 -05:00
Brian Smith 8e335e28ca VRFS-1669 VRFS-1672 bug fixes 2014-06-25 22:20:32 -04:00
Seth Call 20e4a39a61 * oopms. fixing something I just broke; you couldn't start a session that you were only scheduling 2014-06-25 17:44:14 -05:00
Seth Call c7a0208804 * create session/find session 'what app' guard movement; * VRFS-1753 - network guard in place (and FTUE guard withit) 2014-06-25 16:54:31 -05:00
Jonathan Kolyer 5694e19eff VRFS-1265 fixed country/region/city selection issues 2014-06-25 15:47:57 +00:00
Jonathan Kolyer 31ec7ae6b1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-25 14:49:44 +00:00
Jonathan Kolyer 05b3d855d7 VRFS-1458 cleaned up labels and selection issues with country/region/city selects 2014-06-25 14:49:33 +00:00
Brian Smith 67b7e40179 VRFS-1672 session settings dialog work 2014-06-25 02:26:36 -04:00
Brian Smith 1593482f11 VRFS-1669 fix language filter dropdown 2014-06-25 01:03:22 -04:00
Brian Smith 73ba842c6a VRFS-1669 find session work 2014-06-25 00:30:56 -04:00
Seth Call c34a197b9d * VRFS-943 - warn user about read only volume 2014-06-24 17:17:50 -05:00
Seth Call fcda915702 * partial work on VRFS-943 2014-06-24 15:58:17 -05:00
Seth Call 0dac0b21f1 Merge branch 'feature/scheduled_sessions' into develop 2014-06-24 13:51:25 -05:00
Seth Call 37dd1c0438 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-24 13:50:46 -05:00
Seth Call 464c595d6b * fixing controller/request tests 2014-06-24 10:33:31 -05:00
Anthony Davis b897e088ce VRFS-1809 - shouldn't be able to select 'default' instrument during FTUE 2014-06-23 22:28:38 -05:00
Seth Call 6d84241cae * merged 2014-06-23 22:28:23 -05:00
Seth Call 5750584769 * VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works 2014-06-23 22:26:27 -05:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Brian Smith f4b4734c94 VRFS-1669 find session work 2014-06-23 00:58:37 -04:00
Bert Owen e0aebe0751 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-23 01:28:02 +02:00
Bert Owen 00f84da610 VRFS-1807 Create session Step 1, option #1 throws JS error 2014-06-23 01:27:35 +02:00
Brian Smith bc47a0a599 VRFS-1669 find session wip 2014-06-21 16:16:39 -04:00
Seth Call 6aa51e43b9 * fixing typo in istrumens_rsvp 2014-06-20 13:52:11 -05:00
Seth Call d8aa88271e * log 2014-06-20 12:50:31 -05:00
Seth Call 9e92125b59 * VRFS-1653 - websocket reconnect wasn't working if no connect on initial connect 2014-06-19 18:51:47 -05:00
Seth Call 762af63b09 * VRFS-1653 - fixing another startup problem for websocket connections 2014-06-19 14:52:08 -05:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Bert Owen af06127403 fix create session flow, rsvp 2014-06-20 02:43:21 +08:00
Brian Smith 8baebfd105 VRFS-1669 find session wip 2014-06-19 00:44:37 -04:00
Brian Smith b4151c27e9 VRFS-1669 VRFS-1672 session settings dialog / find session work 2014-06-19 00:21:34 -04:00
Seth Call 4425d66484 * VRFS-1574 - network test, audio test GA tracking; VRFS-1653 - fixed bug on initial connect timeout causing runaway connections 2014-06-18 20:59:52 -05:00
Bert Owen f27ff725ef fix create session flow errors. 2014-06-19 00:15:56 +02:00
Seth Call a38174b6e4 * VRFS-1799 - video links in 2014-06-18 14:02:26 -05:00
Seth Call 0856232f9f * VRFS-1798 - fixing 'backendguard' timer 2014-06-17 21:57:40 -05:00
Bert Owen aca8b86316 add session cancel feature 2014-06-18 04:57:48 +08:00
Seth Call b1f4357ac6 * no transmit wip 2014-06-15 22:32:56 -05:00
Seth Call f1bb30ea0d * VRFS-1788 - adding simple 'loop detection' logic 2014-06-15 21:42:57 -05:00
Bert Owen 418ec9d927 account sessions page initial 2014-06-15 15:11:34 +08:00
Bert Owen db6d6fa315 fix tests, rsvp error 2014-06-15 15:10:44 +08:00
Seth Call dbd4e8a823 * VRFS-1789 - loopback UI issues resolved 2014-06-14 22:20:13 -05:00
Bert Owen 07864a0f76 fix scheduled session 2014-06-14 23:03:39 +08:00
Bert Owen d4b467fd42 scheduled session - RSVP slot updated 2014-06-14 21:25:32 +08:00
Bert Owen 88a7ba197a Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-14 20:52:47 +08:00
Bert Owen e336828d22 fix create session flow 2014-06-14 20:52:25 +08:00
Seth Call e5b4177d38 * remove logs from FTUE diagonstics 2014-06-13 15:53:30 -05:00
Seth Call bcaad53466 * fixing typo in log statement 2014-06-13 15:07:17 -05:00
Seth Call f00ac3b164 * VRFS-1777 fixing hoverOut issue; also adding some debugs for missing mixers 2014-06-13 15:03:48 -05:00
Seth Call 8b85d2fb7f * resolving VRFS-1781 2014-06-13 12:51:03 -05:00
Brian Smith bedb377be8 VRFS-1749 session info tests wip 2014-06-13 03:45:45 -04:00
Seth Call 1fe8a77b59 * prod the user that their output device doesn't work, in the case it only has 1 output 2014-06-12 15:30:22 -05:00
Seth Call b93ff48a91 * fixing alert registration bug 2014-06-12 14:52:26 -05:00
Seth Call 8c92820275 * fix case where an invalid chat will make 'next' go disabled 2014-06-12 14:29:38 -05:00
Seth Call 942677a467 * oops. making constant available to callers 2014-06-12 13:40:08 -05:00
Seth Call 0d8875c00f * VRFS-1774 handling voice chat failure scenarios better; delegating to gear_test for invalid audio notice 2014-06-12 13:36:51 -05:00
Seth Call 5c16d54291 * VRFS-1770 - showing banner when backend event happens after FTUE attempt 2014-06-11 21:47:56 -05:00
Seth Call bc43837a19 * protect against events that happen while outside of session 2014-06-11 16:59:14 -05:00
Seth Call 7c3806821e * moving backend alert initialization to early in frontend initialization, to prep for receiving bad device events (VRFS-1770) 2014-06-11 16:52:46 -05:00
Seth Call a52f5a1ae4 * VRFS-1774 - trying to handle case where chat fails to apply 2014-06-11 15:37:15 -05:00
Seth Call 382515d5b2 * VRFS-1777 - let unassigned tracks also show all text on hover 2014-06-11 14:08:27 -05:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -04:00
Seth Call d38e5d155a * fix for bad reference to context.JK.EVENTS 2014-06-10 22:27:37 -05:00
Seth Call f644a12487 * VRFS-1777 hovering working for all but unassigned ports 2014-06-10 22:07:35 -05:00
Seth Call 5d926ee651 * fix 'Same as Input' problem VRFS-1768; also fixed yellow links on play button 2014-06-10 15:28:29 -05:00
Seth Call c70a76cbbe * VRFS-1768 - updated position and color of controlbuttons 2014-06-10 15:16:10 -05:00
Seth Call 5f889d5af6 * fix tests 2014-06-10 14:20:57 -05:00
Bert Owen de7cb2d6ab fix tests 2014-06-11 03:06:17 +08:00
Seth Call dbc17a89c6 * VRFS-1775 - yellow links on success page 2014-06-10 13:26:14 -05:00
Seth Call cad7044488 * deal with the None placeholder not showing in successive FTUE attempts 2014-06-10 10:12:24 -05:00
Seth Call 07fcef6844 * fix case where unassigned chat doesn't relinquish it 2014-06-10 09:44:50 -05:00
Seth Call 169c9b0ab1 * VRFS-1774 - de-dup channels repeated
* VRFS-1774 - filter out assigned channels
* VRFS-1773 - no pre-assignment on step 3 (configure tracks)
* VRFS-1774 - make radiobuttons appear more disabled; no more prod
* VRFS-1767 - probably gone; but there is a more fundamental issue
2014-06-10 09:02:51 -05:00
Seth Call 60a1618c9b * oops left in manual show of frame-buffers for VRFS-1772 2014-06-09 23:30:02 -05:00
Seth Call 4219b15815 * VRFS-1772 - prevent wrapping of frame-buffers 2014-06-09 23:28:31 -05:00
Bert Owen 3ed14be60f finish basic create session flow 2014-06-10 06:13:54 +08:00
Seth Call 507eba6fbc * VRFS-1759 - found another getOperatingMode that needed to be protected 2014-06-09 16:33:34 -05:00
Seth Call 4a603cbaa2 * VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives 2014-06-09 15:43:16 -05:00
Seth Call 9421ded0da * fix add new gear click handler 2014-06-09 08:42:14 -05:00
Seth Call 653b03bea1 * VRFS-1754 - new configure tracks dialog 2014-06-08 22:26:50 -05:00
Bert Owen f333f110b8 fix type error 2014-06-09 10:43:07 +08:00
Brian Smith 1339d8448f VRFS-1669 find session work 2014-06-06 03:07:02 -04:00
Brian Smith 1a93b5f1f3 VRFS-1710 added scheduled session info to hover bubble / show session hover bubble for session-related notifications 2014-06-06 03:04:52 -04:00
Seth Call 60c72f29dd * VRFS-1753 - mostly done aside from prompt with dialog on create/find session when appropriate 2014-06-04 14:47:05 -05:00
Bert Owen 60a004a252 integrating api, (without music_notations, start scheduled information) 2014-06-05 03:19:45 +08:00
Bert Owen 6a4be359c0 fix ui 2014-06-04 23:15:12 +08:00
Seth Call 84f1e79223 * pin admin tests 2014-06-03 17:45:48 -05:00
Seth Call 9c19167519 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-03 16:20:00 -05:00
Seth Call a94c5b325b * VRFS-1575 - reworking loopback 2014-06-03 16:19:39 -05:00
Brian Smith 44392af1ad renamed scheduled_session.js to session_info.js 2014-06-01 22:34:32 -04:00
Bert Owen e49c98c659 Merge branch 'feature/scheduled_sessions' into feature/create_session_flow 2014-06-02 02:57:15 +08:00
Bert Owen cb6742d06b Create session flow (ui completed...) 2014-06-02 02:45:17 +08:00
Scott Comer afa21de689 make score info available to template and make visible on the screen 2014-05-31 15:22:21 -05:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Seth Call 48aaf8bff0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-30 15:29:05 -05:00
Seth Call 32decb2393 * VRFS-1575 - don't resync if minimum input/outputs aren't selected. also don't attempt score on refocus if minimum input/outputs aren't selected 2014-05-30 15:28:59 -05:00
Scott Comer 275c997591 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-30 14:12:35 -05:00
Seth Call ac2253c49f * re-orging any wizard into subfolders 2014-05-30 12:35:54 -05:00
Seth Call 572c8449b9 * VRFS-1575 - implemented isNetworkError 2014-05-30 12:25:47 -05:00
Seth Call 3a5fe7e615 * invalidating network score in certain scenarios; invalidating audio profile in certain scenarios VRFS-1575 2014-05-30 12:07:27 -05:00
Scott Comer e9b77ff5b5 attempt to try to add scoring to musicians web page; add appropriate back-end filtering for score 2014-05-30 11:34:06 -05:00
Seth Call 6b71b54ca9 * VRFS-1575 - handle case that input is unset 2014-05-30 09:50:35 -05:00
Seth Call cab835910a * only reset selected gear if it's a completely new FTUE session 2014-05-29 22:10:53 -05:00
Seth Call 5cd947729c * don't track user-agent of 'monitor' 2014-05-29 21:51:02 -05:00
Brian Smith a607124e63 VRFS-1746 RSVP cancel dialog bug fixes 2014-05-29 22:19:30 -04:00
Seth Call 4919b92771 * adding backend guard to network test step 2014-05-29 21:13:50 -05:00
Brian Smith d4a21e62f3 VRFS-1746 RSVP cancel dialog complete 2014-05-29 22:02:29 -04:00
Seth Call 7d246ef817 * fix reconnect and limit bands 3 test 2014-05-29 20:58:40 -05:00
Seth Call 6ad607cd24 * fixing latency tester's page 2014-05-29 16:52:50 -05:00
Seth Call 7da75e94d9 * VRFS-1575 2014-05-29 14:44:37 -05:00
Seth Call dff3fa4870 *wip 2014-05-29 14:44:37 -05:00
Seth Call a2bf56beac * wip 2014-05-29 14:44:37 -05:00
Seth Call fcc7130536 * wip 2014-05-29 14:44:37 -05:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Seth Call ebe1278e5e * wip 2014-05-29 14:32:46 -05:00
Seth Call cc3d48ed0a * wip 2014-05-29 14:32:46 -05:00
Seth Call df5fae1981 * wip 2014-05-29 14:32:46 -05:00
Seth Call d39f91e186 * VRFS-1575 - step 2 of FTUE almost done 2014-05-29 14:31:01 -05:00
Seth Call 9b18849544 * working on feature ftue 2014-05-29 14:31:01 -05:00
Brian Smith f1229f6842 VRFS-1746 RSVP cancel dialog work 2014-05-29 02:33:37 -04:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Brian Smith 4d63dad502 VRFS-1671 RSVP submit dialog 2014-05-28 23:43:57 -04:00
Brian Smith fea728923f VRFS-1671 RSVP submit dialog work 2014-05-28 01:14:14 -04:00
Brian Smith c7fc7bdc22 VRFS-1668 clean up notifications / fix comment notification for session info page 2014-05-27 22:35:26 -04:00
Brian Smith 860704f874 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-27 21:31:42 -04:00
Brian Smith 6dc8192516 session info permissioning work 2014-05-27 21:31:39 -04:00
Seth Call 93ddd02bd1 * using extra_js block to initialize page code 2014-05-27 11:00:08 -05:00
Brian Smith f31248815d VRFS-1670 session info page work 2014-05-26 23:52:59 -04:00
Brian Smith cc4686ab79 VRFS-1670 session info page work 2014-05-26 01:35:57 -04:00
Brian Smith 16b240fdc8 merge scheduled_sessions branch 2014-05-24 04:01:40 -04:00
Brian Smith a06ba7197e VRFS-1670 session info page work 2014-05-24 03:58:47 -04:00
Brian Smith 03eb125fa8 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-22 00:42:33 -04:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Bert Owen 22f4d0ffc5 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-20 21:26:55 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Seth Call d11261c5c6 * VRFS-1730 - websocket on web layout 2014-05-20 00:33:43 -04:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Seth Call a0fbd433b3 * brought back two pending test 2014-05-19 18:49:02 -05:00
Seth Call 1f86b809ff * VRFS-1730 - websocket on web layout 2014-05-19 16:57:08 -05:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Brian Smith baee1b7506 VRFS-1668 merge with test fixes for notification changes 2014-05-15 01:06:48 -04:00
Brian Smith 27517c673f VRFS-1668 more test fixes 2014-05-14 01:51:18 -04:00
Brian Smith 212ef168c9 VRFS-1668 fixing tests related to notification changes 2014-05-14 01:16:33 -04:00
Seth Call 9ee27a5127 Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic"
This reverts commit 2302c89154.
2014-05-13 08:21:32 -05:00
Brian Smith 2302c89154 VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic 2014-05-13 01:22:23 -04:00
Jonathan Kolyer 91ca1af98b VRFS-736 like us GA support 2014-05-11 06:42:20 +00:00
Seth Call dc6dec76cf * move registerChatMessage so that it always gets a chance to fire 2014-05-09 14:27:18 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -05:00
Brian Smith c549128c90 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:26:38 -04:00
Brian Smith 58b7f27387 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:16:20 -04:00
Jonathan Kolyer ebe9aa1047 VRFS-1577 VRFS-736 2014-05-07 01:33:27 +00:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00
Seth Call 732fd66f0e * all tests pass; but need to now rename music session tables to match class names... 2014-05-06 16:17:26 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Bert Owen 7d3ac6fc54 VRFS-1503 implement session chat feature 2014-05-03 00:33:27 +08:00
Bert Owen bf04fca205 VRFS-1503 implement session chat feature 2014-05-03 00:30:56 +08:00
Seth Call c0ce26c602 * fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-05-01 14:09:33 -05:00
Jonathan Kolyer affb1cd875 VRFS-1577 2014-05-01 06:35:16 +00:00
Jonathan Kolyer b1be072c6c VRFS-1577 VRFS-736 2014-05-01 01:48:57 +00:00
Jonathan Kolyer 2cbfae2215 VRFS-1577 VRFS-736 2014-04-30 20:49:32 +00:00
Seth Call ad266e5b80 * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-04-30 15:29:10 -05:00
Jonathan Kolyer 968dff2829 VRFS-1577 VRFS-736 2014-04-30 16:44:37 +00:00
Jonathan Kolyer 2ee96c49ec merging develop 2014-04-30 14:21:23 +00:00
Jonathan Kolyer dddc0311c0 VRFS-1577 VRFS-736 session ratings 2014-04-30 14:07:23 +00:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Seth Call 264d65d98b * merged in more websocket fixes 2014-04-29 14:22:23 +00:00
Seth Call 8262725aae * merging in some gateway fixes 2014-04-29 14:19:42 +00:00
Brian Smith 4b98350f48 remove debug logs 2014-04-29 03:36:09 -04:00
Brian Smith 8b43e63800 VRFS-1558 added tests 2014-04-29 03:33:37 -04:00
Brian Smith 8eedd63d7f Merge branch 'develop' into feature/widget_fixes_1558 2014-04-28 23:22:08 -04:00
Brian Smith 4e188d74b7 VRFS-1562 make avatars clickable links (this commit addresses Feed and comment dialog only) 2014-04-27 20:28:25 -04:00
Brian Smith 2b7ef1df55 VRFS-1350 hover bubble style improvements 2014-04-27 19:00:18 -04:00
Brian Smith 15e8ddb706 VRFS-1558 comment dialog work 2014-04-27 10:06:01 -04:00
Brian Smith 9b810310f9 VRFS-1558 implement comment dialog 2014-04-27 04:09:55 -04:00
Brian Smith 37c23d4ee2 VRFS-1558 wire up share button dialog / hide new share icon if session has ended 2014-04-26 23:59:38 -04:00
Brian Smith c06458550c VRFS-1436 allow unauthenticated uses to share recordings and sessions from landing pages 2014-04-26 14:21:17 -04:00
Brian Smith 23137ec423 VRFS-1558 widget enhancement work 2014-04-25 01:56:24 -04:00
Seth Call 26dc80436c * merging build script 2014-04-24 18:07:52 +00:00
Seth Call 2496c051a3 * doubting approach of using sessionModel as trigger handler; changing to document 2014-04-23 22:13:37 +00:00
Seth Call fb662e82be * sessionModel to send out events on start/stop 2014-04-23 22:03:00 +00:00
Seth Call bc006b8c71 * adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually 2014-04-23 19:48:40 +00:00
Bert Owen 3921324b32 VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:34:59 +02:00
Bert Owen 07e141cc8f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:49 +02:00
Jonathan Kolyer ed09892284 merging develop and vrfs1576 2014-04-23 07:50:50 +00:00
Jonathan Kolyer 55b149827a VRFS-1576 report layout 2014-04-23 07:43:35 +00:00
Jonathan Kolyer 7b2d124b33 VRFS-1576 affiliate report view integration 2014-04-23 06:38:49 +00:00
Seth Call 5695338266 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-22 17:53:49 +00:00
Seth Call 30ca8d7c5c * wip still on new ftue. also push release branches to repository VRFS-1639 2014-04-22 17:53:41 +00:00
Bert Owen 7893affafb VRFS-1592 add custom message in app dialog, fix test 2014-04-21 17:17:40 +02:00
Bert Owen 5d9d87bc56 VRFS-1592 show app dialog, without customization. 2014-04-21 10:04:37 +02:00
Bert Owen 404670c9a5 VRFS-1609 fixed 2014-04-19 12:52:54 -07:00
Bert Owen bd0df88e24 link musician/band profile on feed page 2014-04-18 19:14:11 -07:00
Seth Call 585385351d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-16 17:11:39 +00:00
Seth Call d1267dff53 * wip on new ftue 2014-04-16 17:11:30 +00:00
Anthony Davis ca78165cf0 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 21:03:51 -05:00
Anthony Davis e3b57da087 VRFS-1616 fixed javascript c&p error 2014-04-15 21:03:39 -05:00
Seth Call 1d6741714d * resque_spec path removed 2014-04-15 15:17:44 +00:00
Seth Call 21a101cc56 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-15 15:02:57 +00:00
Seth Call 87f0eaa07b * VRFS-1612 - fix for invitations showing up when they shouldn't. also new ftue wip progres 2014-04-15 15:02:45 +00:00
Brian Smith e01409a0fb VRFS-1530 added missing semicolon (not sure if this will fix issue or not - unable to reproduce) 2014-04-15 00:48:48 -04:00
Brian Smith 628f250a7f VRFS-1511 fix hover bubble positioning and mouseout issues 2014-04-10 02:21:21 -04:00
Brian Smith ff03770256 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-09 21:18:57 -04:00
Seth Call cc7bbf3f6a * resolved merge 2014-04-09 18:31:40 +01:00
Seth Call 95f1a59851 * VRFS-1404 reconnect with tests 2014-04-09 18:25:52 +01:00
Brian Smith 2525f86c4f VRFS-1350 update timestamps to use timeago 2014-04-08 23:52:30 -04:00
Brian Smith 8e9bf41b10 VRFS-1573 start playing audio as soon as session/recording landing pages load 2014-04-08 22:29:03 -04:00
Seth Call 3dfc455fa4 * reconnect working for in-session; beginning in-situ reconnect refactor 2014-04-08 12:43:26 +01:00
Brian Smith a6f5fa7f54 VRFS-1356 do not display broken instrument icon by using helper method that resolves to default icon 2014-04-08 01:41:25 -04:00
Brian Smith 4906c2b902 VRFS-1437 update play and like stats during refresh 2014-04-08 01:21:10 -04:00
Brian Smith 5784c26089 VRFS-1437 fix bug 2014-04-08 01:17:40 -04:00
Brian Smith 73f819511e VRFS-1437 update recording/session landing page comments automatically 2014-04-08 00:59:35 -04:00
Seth Call 79c243a20b * automatic reconnect dialog will guide user without having to click - VRFS-1404 2014-04-07 17:36:08 +01:00
Brian Smith cdc28e48fb remove alert 2014-04-06 16:44:56 -04:00
Brian Smith 6cda9023c7 VRFS-1440 session and recording landing page comments should use timeago for timestamps 2014-04-06 16:43:32 -04:00
Seth Call 700ef04edf * VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test 2014-04-04 23:16:38 +01:00
Seth Call 8f18ed09f2 * removing jquery.d dependencie 2014-04-04 20:18:33 +01:00
Seth Call 26d7b067f1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-04 19:38:42 +01:00
Seth Call b48308a4fd * VRFS-1575 - just very initial work 2014-04-04 19:38:31 +01:00
Seth Call f1ef1de83c * wip new ftue 2014-04-03 15:11:23 +01:00
Brian Smith 7e8b6eb238 VRFS-1465 add tests 2014-04-03 00:19:39 -04:00
Seth Call 7bfe1cb634 * VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
Seth Call ad2cfe41cd * merged 2014-03-31 03:35:04 +01:00
Seth Call da7fc7d901 * VRFS-1541 done from a code perspective... just need to do some admin work once posted 2014-03-31 03:28:04 +01:00
Seth Call 39bd83ae5a * launch app test 2014-03-28 04:00:57 +00:00
Seth Call 4e74ba438c * initializing 'me' for sidebar 2014-03-28 02:24:53 +00:00
Seth Call b7c6d8b9c0 * fix broken refreence to initializeFriendsPanel in notificaitonsPanel.js 2014-03-28 02:16:57 +00:00
Seth Call 94494a2b3a Merge branch 'feature/highlight_notifications' into develop 2014-03-27 18:44:34 +00:00
Seth Call 53a6941ceb * VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
2014-03-27 18:43:15 +00:00
Seth Call ba43244b69 * fixing the refresh of sidebar friends when friend request accepted 2014-03-26 17:31:51 +00:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Seth Call d365054237 * VRFS-1533 - track in success path, not failure path of download GA info 2014-03-25 22:42:15 +00:00
Seth Call 1aef96b697 * VRFS-1474 cleaned up some error case dialogs 2014-03-25 16:30:22 +00:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +00:00
Seth Call 85cb225a3d * fix for VRFS-1517 - empty notifications in sidebar 2014-03-21 20:21:03 +00:00
Seth Call 8f1d48da40 * merged in VRFS-1110 2014-03-20 13:08:59 +00:00
Seth Call 7cdd47ac89 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-20 11:53:35 +00:00
Seth Call b04c7bcea5 * VRFS-871 - user-to-user messaging complete 2014-03-20 11:53:26 +00:00
Jonathan Kolyer c8a60a7d83 VRFS-1422 removed extra call to facebookHelper.promptLogin() which is unnecessary for feed posts 2014-03-17 16:58:48 +00:00
Scott Comer 3ff131c031 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-17 22:39:47 -05:00
Scott Comer ddabbcecc5 fix countries to use labels for users, bands, and new signups 2014-03-17 22:20:41 -05:00
Brian Smith e38494b0f9 VRFS-1481 display 256x256 instrument icons on musician profile page 2014-03-17 18:55:11 -04:00
Seth Call b783d270b1 * VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors 2014-03-15 16:47:21 +00:00
Seth Call 964fcb5f0e * VRFS-1456 - hoverIntent error goes away once you stop including jquery twice\! 2014-03-15 04:42:36 +00:00
Brian Smith fde9c64e11 VRFS-1439 fix display issue in musician profile social tab 2014-03-14 00:57:28 -04:00
Brian Smith 90ab928a7c VRFS-1448 fix bug with Connect button in Fan hover bubble 2014-03-13 22:56:11 -04:00
Jonathan Kolyer f56fcd6fab Merge branch 'develop' into VRFS-1110 2014-03-13 10:53:47 +00:00
Jonathan Kolyer 148fc69950 VRFS-1110 in createBandInvitation fixed selector for invitation list 2014-03-13 10:51:21 +00:00
Jonathan Kolyer 14fa5e18e5 VRFS-1110 clear the friend input beforeShow 2014-03-13 10:20:25 +00:00
Jonathan Kolyer 45f2124cfa VRFS-1110 removed autocomplete for session update 2014-03-13 10:00:17 +00:00
Brian Smith 0b02e9e323 fix JS error with notifications 2014-03-13 05:24:24 -04:00
Jonathan Kolyer c46f8c4476 VRFS-1110 added instructions argument 2014-03-13 09:23:22 +00:00
Jonathan Kolyer b428bbb913 VRFS-1110 fixed integration of InviteMusiciansUtil to band setup 2014-03-13 08:47:27 +00:00
Jonathan Kolyer a91092a048 Merge branch 'develop' into vrfs1110 2014-03-13 07:49:10 +00:00
Brian Smith 31d94344b5 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-11 19:54:51 -04:00
Seth Call a5a083a4e8 * fix for recording landing page not working, and fix for sort order enforced for jamfest 2014-03-11 15:50:08 +00:00
Brian Smith 2b89cc208b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-11 07:52:14 -04:00
Seth Call 164a4fdbe1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-11 07:41:18 +00:00
Seth Call 24f8bb257c * VRFS-1168 - done except the distance filter, but that's assigned elsewhere anyway 2014-03-11 07:40:58 +00:00
Seth Call c9438fcf99 * feed shows items. no scrolling, no support for query modification yet 2014-03-11 06:09:44 +00:00
Brian Smith 12701f447d VRFS-600 attempt to fix IE10 2014-03-11 00:52:39 -04:00
Seth Call 59b21c557b * fix feed screen 2014-03-10 22:01:11 +00:00
Seth Call 5a76f42fcd * beginning feed work, and loosening the query for when a session starts for event feature 2014-03-10 21:47:19 +00:00
Seth Call 5dd0463d72 * ugh js error 2014-03-10 18:36:42 +00:00
Jonathan Kolyer 61c509422b Merge branch 'develop' into vrfs1110 2014-03-10 17:35:14 +00:00
Seth Call 9225937ee7 * using UTC date 2014-03-10 17:24:29 +00:00
Jonathan Kolyer e408bb4274 VRFS-1110 fixed couple nits 2014-03-10 16:50:53 +00:00
Seth Call 030d31eadc supply link on facebook share - VRFS-1376 2014-03-10 16:24:36 +00:00
Jonathan Kolyer a2b6aaf783 VRFS-1110 integrated autocomplete 2014-03-10 15:14:12 +00:00
Jonathan Kolyer 00c45b4612 VRFS-1393 changed FB share image to use square logo-512.png 2014-03-10 11:47:31 +00:00
Seth Call 3c5a14312a * Event page 'chrome' is setup and pulling from database--now to add band logic 2014-03-09 22:58:57 +00:00
Seth Call 23e5906e55 * VRFS-1253 - account for unknowns 2014-03-09 19:35:42 +00:00
Seth Call 5a8c3886fd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-09 18:05:39 +00:00
Seth Call 000dd3fdd0 * VRFS-1253 - working in a basic sense with pagination 2014-03-09 18:04:56 +00:00
Jonathan Kolyer 5abc877a38 VRFS-709 added calls to GA record/session tracking 2014-03-09 01:16:39 +00:00
Jonathan Kolyer e271feeb70 VRFS-1333 addPlayablePlay integration 2014-03-08 23:59:56 +00:00
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +00:00
Brian Smith e67b091015 VRFS-600 replace console.debug with console.log (except for tests 2014-03-08 14:52:32 -05:00
Brian Smith dd520ee6e6 VRFS-1382 add new template parameter to Followers section 2014-03-08 14:33:40 -05:00
Brian Smith 1bd8271b03 VRFS-1382 fix band hovers on musician profile Social tab 2014-03-08 14:31:49 -05:00
Brian Smith a5a8575ccf VRFS-1378 scope CONNECT button for main search results page so the sidebar CONNECT button is not invoked twice 2014-03-08 12:49:11 -05:00
Brian Smith 00a447037a VRFS-1287 VRFS-1340 fix issues with weird behavior of Okay and Cancel buttons in notifications 2014-03-08 01:37:25 -05:00
Brian Smith 9c2b10dd5f VRFS-1243 VRFS-1310 fix regression in session notifications in sidebar 2014-03-07 19:56:27 -05:00
Seth Call faed48271b * VRFS-1372 resolved, and not requiring local only until figure out some deployment issues 2014-03-07 14:20:34 -06:00
Jonathan Kolyer 77528ddc9d VRFS-1333 added recordingId 2014-03-07 09:05:34 +00:00
Jonathan Kolyer db3a063bd2 Merge branch 'develop' into vrfs1333 2014-03-07 07:35:31 +00:00
Jonathan Kolyer 38bde04ec7 VRFS-1333 play tracking 2014-03-07 07:35:10 +00:00
Seth Call adb37e06a6 * merged 2014-03-07 01:31:13 -06:00
Seth Call d6b6cb553c * adding data-claimed-recording-id to feed entry, and pass in claimedRecordingId as an option to .listenRecording() in recording landing page, and home page 2014-03-07 01:30:38 -06:00
Jonathan Kolyer eb98b97cd5 merge conflict 2014-03-07 06:53:35 +00:00
Jonathan Kolyer 46b0832cd8 VRFS-1333 play tracking 2014-03-07 06:46:07 +00:00
Brian Smith 667c629c27 VRFS-1052 fix timestamp issue with notifications (moved to timeago plugin) 2014-03-07 01:30:23 -05:00
Brian Smith 49269443da VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type 2014-03-07 00:38:10 -05:00
Seth Call 8d36cd8e27 * VRFS-1311 GetChatInputs is used now to list in new FTUE 2014-03-06 13:51:02 -06:00
Seth Call 4f626cc644 * VRFS-900 check for no tracks when you land directly on session screen, and if you find session 2014-03-06 12:17:47 -06:00
Seth Call a3289c5d4c * VRFS-900 - guard against 0 tracks 2014-03-06 11:56:15 -06:00
Seth Call 0d27a47b42 * VRFS-1308 - make configure tracks be cool about no selected items when the user indicates they might want to configure them. fix some recording styling button issues 2014-03-06 11:02:50 -06:00
Seth Call 104bf40a49 * VRFS-1264 and VRFS-1047 2014-03-05 21:20:00 -06:00
Seth Call 1c2585ba92 * VRFS-1047 mosttly done, aside from jamfet link 2014-03-05 17:18:53 -06:00
Seth Call 71c4948ef6 * pop videos in system browser if jamaclient 2014-03-05 13:28:19 -06:00
Seth Call 83e793c046 * adding hover bubbles to frontpage VRFS-1047 2014-03-05 12:28:10 -06:00
Seth Call 0436ca1f4d * enable select items in old ftue when device chosen 2014-03-05 10:59:08 -06:00
Seth Call a63869ce27 * reverting ftue, account profile screen to before any showing of disabled devices 2014-03-05 10:49:10 -06:00
Seth Call 2454ff2b05 * rolling back some android specific changes that don't help 2014-03-05 09:22:40 -06:00
Seth Call 67219f8125 * convert all debug statements to log to work in IE10 2014-03-05 09:10:12 -06:00
Seth Call 9a354823c8 * play start abort ignore for now until more testing 2014-03-05 08:23:38 -06:00
Brian Smith f96019ba69 added new JS bridge method 2014-03-05 02:14:02 -05:00
Brian Smith 997ca081d5 clean up logs 2014-03-05 01:24:05 -05:00
Brian Smith c6e660dac2 VRFS-1336 utils changes for this bug fix 2014-03-05 01:22:29 -05:00
Brian Smith a8a7ecea7d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-05 01:16:57 -05:00
Brian Smith 7c16674c27 VRFS-1336 show user friendly config name 2014-03-05 01:16:31 -05:00
Seth Call 14ce28d964 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-05 00:15:58 -06:00
Seth Call db15ec0a66 * recording widget working on home page VRFS-1264 2014-03-05 00:15:46 -06:00
Brian Smith 2abceaef8c VRFS-1336 show user friendly config name 2014-03-05 01:11:48 -05:00
Brian Smith 6d277f6597 fix bug retrieving band followers 2014-03-04 22:32:04 -05:00
Brian Smith 9938ec0a1d hide REMOVE MEMBER button when showing Pending Band Members 2014-03-04 22:29:58 -05:00
Brian Smith 64824d3587 VRFS-614 remove remaining async=false lines 2014-03-04 22:12:44 -05:00
Seth Call 314d3c9dac * supporting session widget in rich client 2014-03-04 12:22:42 -06:00
Seth Call 3afdd55a15 * fix IE auth issues (and other browsers)... chehck if session is over between every retry play attempt 2014-03-04 11:56:42 -06:00
Seth Call 7d0ca26bda * restrict not null 2014-03-04 11:06:53 -06:00
Seth Call 81d3a0a540 * make remote show track when loaded in-session 2014-03-04 09:14:16 -06:00
Seth Call e09b563737 * clean up lowercase k's in emails: VRFS-732 2014-03-04 01:09:13 -06:00
Seth Call 64d77d4ebb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 00:59:31 -06:00
Seth Call 44be38f2b0 * VRFS-1280 - allow people to listen to public widgets without being logged in by allowing music session show API public access 2014-03-04 00:58:40 -06:00
Brian Smith 33500fa385 fixed bugs with showing valid/invalid profiles on account and account audio screens 2014-03-04 01:52:13 -05:00
Brian Smith 171a2371a7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 01:03:39 -05:00
Brian Smith 78560a71a1 VRFS-1287 unbind click each time notification is rendered 2014-03-04 01:03:26 -05:00
Seth Call 9b8caedbb2 * VRFS-1309 - Edit link erroneously shown on non-you profiles 2014-03-03 23:34:00 -06:00
Seth Call e01491aa86 * VRFS-1330 - load recordings again 2014-03-03 23:11:54 -06:00
Brian Smith e53dcc722f fix JS error in error handler 2014-03-03 19:15:29 -05:00
Seth Call aa62cc7d2a * deal with extremes by squelching to values VRFS-1319 2014-03-03 18:09:27 -06:00
Seth Call f0a9b90583 * VRFS-293 - connection status indicators hooked up 2014-03-03 16:49:53 -06:00
Seth Call 3c4f5c7e55 * merged 2014-03-03 16:18:03 -06:00
Seth Call 7ab7bfd795 * VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state 2014-03-03 16:13:23 -06:00
Jonathan Kolyer 848430ef05 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-03 00:51:36 +00:00
Jonathan Kolyer 0b7e860bd1 VRFS-756 removed extranous args from ajaxError 2014-03-03 00:50:32 +00:00
Brian Smith 19f011a3c8 fix syntax errors 2014-03-02 17:10:12 -05:00
Brian Smith 4e032f583d expose new JS bridge methods 2014-03-02 17:09:02 -05:00
Brian Smith 9a1bba988b VRFS-604 show disconnected devices in FTUE 2014-03-02 17:00:11 -05:00
Brian Smith 57ea6134ff VRFS-1254 clip long names for sidebar 2014-03-02 16:44:36 -05:00
Brian Smith 8dc8e99a3b VRFS-604 show invalid profiles on main account screen 2014-03-02 15:58:12 -05:00
Brian Smith 25a4e14e3a VRFS-604 clear html before appending 2014-03-02 15:14:54 -05:00
Brian Smith 11a9d8b77b VRFS-604 show disconnected devices on audio profile screen 2014-03-02 15:06:23 -05:00
Seth Call 0d53309cd5 * delay track changes 3 seconds; not one 2014-03-01 23:20:48 -06:00
Seth Call 3ddc471586 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-01 23:20:12 -06:00
Seth Call c12b561c3f * adding timing debug to REBUILD_MIXER and updating much of the notifications 2014-03-01 23:19:43 -06:00
Brian Smith 59dff168ff VRFS-830 convert Audio Device dropdown to easydropdown 2014-03-01 22:54:48 -05:00
Brian Smith 4a8434f71c VRFS-830 convert Audio Device dropdown to easydropdown 2014-03-01 22:53:35 -05:00
Brian Smith 3d8a84c552 minor refactor 2014-03-01 22:19:13 -05:00
Brian Smith 8ca840548d VRFS-950 not a fix, but should only call TrackSaveAssignments once 2014-03-01 21:25:59 -05:00
Seth Call 725460176a * VRFS-792 - also guard against direct session link joins with no ftue 2014-03-01 17:01:45 -06:00
Seth Call 87f4890638 * VRFS-1279 - whats next dialog shows twice, VRFS-721 - default to 1 for kernel streaming 2014-03-01 10:39:35 -06:00
Seth Call a9edcfa798 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-01 08:58:56 -06:00
Seth Call 7a820e7827 * VRFS-726 - don't care if ftue has succeeded before; we care if there are any good devices 2014-03-01 08:58:42 -06:00
Jonathan Kolyer 6e996c468c Merge branch 'vrfs756' into develop 2014-03-01 04:44:00 +00:00
Jonathan Kolyer bfd2c5997d VRFS-756 added error handling and cleanup 2014-03-01 04:37:22 +00:00
Jonathan Kolyer 23957d0260 VRFS-756 fixed bugs 2014-03-01 03:07:48 +00:00
Seth Call 1e55b4acc8 * working towards using a loaded deferrable in recording 2014-02-28 20:29:20 -06:00
Seth Call b7a1e06889 * working on generic recording widget logic 2014-02-28 19:28:17 +00:00
Jonathan Kolyer af1186d0ef Merge branch 'develop' into vrfs756 2014-02-28 18:02:34 +00:00
Jonathan Kolyer b4aae340f7 merge conflict 2014-02-28 07:07:26 +00:00
Seth Call d98bc2d210 * VRFS-1248 - rolled back 2014-02-28 06:40:19 +00:00
Seth Call cc44c00865 * refactor more stuff into listenBroadcast jquery plugin in preparation of doing VRFS-1261 2014-02-28 04:19:39 +00:00
Seth Call 8c9546918f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-28 02:51:56 +00:00
Seth Call 56ce4c9fe8 * session broadcast widget working decently well 2014-02-28 02:50:17 +00:00
Brian Smith b2de499d9d fix session notification LISTEN link 2014-02-27 21:32:55 -05:00
Brian Smith d89b776131 change un-follow to unfollow for consistency 2014-02-27 21:31:01 -05:00
Seth Call 51f955fc74 * VRFS-1047 - broadcast widget almost fully done 2014-02-28 00:24:55 +00:00
Seth Call dcc5437f3a * fix import of common by custom 2014-02-27 19:22:58 +00:00
Seth Call fd584967f2 Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 18:38:12 +00:00
Seth Call aaef11add4 * VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only 2014-02-27 18:38:02 +00:00
Brian Smith a95b0fb151 VRFS-1237 fix hover bubble in musician list 2014-02-27 00:15:02 -05:00
Brian Smith f77965b851 VRFS-1239 remove dead code 2014-02-26 23:26:24 -05:00
Brian Smith 701063f865 VRFS-1239 show Click to Join link only in thick client, also prompt with terms or join request dialog as needed 2014-02-26 23:22:09 -05:00
Seth Call f0e916e736 * VRFS-1047 - looks good; no audio hooked up 2014-02-27 00:38:01 +00:00
Brian Smith ee0a25293d VRFS-1235 de-dup tracks on recording hover 2014-02-25 22:04:19 -05:00
Brian Smith c4dd04de69 fix JS error 2014-02-25 21:18:50 -05:00
Seth Call 7882d65dc7 * VRFS-1165 resolved for real this time 2014-02-25 21:25:59 +00:00
Seth Call 7a41b74549 * VRFS-1228 2014-02-25 19:22:32 +00:00
Seth Call 7753a2d4b3 * VRFS-1228 - can add, but not update ,user biography 2014-02-25 05:41:43 +00:00
Jonathan Kolyer a1a265f36f VRFS-756 changing email invite posting behavior incrementally 2014-02-25 03:29:03 +00:00
Seth Call e3c4b09c3f * promptLeave 2014-02-25 02:20:17 +00:00
Seth Call 25b9d8e420 * adding better error reporting to session errors 2014-02-24 21:49:38 +00:00
Seth Call a90b909ac3 * fixing account identity tests and search tests 2014-02-24 18:54:19 +00:00
Seth Call e4718652fd * merging 2014-02-24 16:57:01 +00:00
Seth Call 0522c20e60 * VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock 2014-02-24 16:55:56 +00:00
Brian Smith ccee2e15b3 VRFS-1210 VRFS-1212 VRFS-1223 bug fixes 2014-02-24 01:10:09 -05:00
Brian Smith b2718de7cf VRFS-1223 allow unauthenticated users to view hover bubbles but hide action buttons 2014-02-23 21:05:31 -05:00
Jonathan Kolyer 7ff4184731 VRFS-808 Added call to initAfterConnect from loggedIn(); added timeout to repeated attempts in case of missing WSG login ack 2014-02-23 23:49:53 +00:00
Brian Smith 83b4260b91 VRFS-759 VRFS-1221 delete session notifications when session ends in db and sidebar, fix listen button for sessions and recordings 2014-02-23 15:47:53 -05:00
Brian Smith c79c841b57 fix avatar url for session invitation popup notification 2014-02-23 13:31:18 -05:00
Seth Call bab83c91c1 * oops. def didn't mean to leave that fake backend event in 2014-02-23 05:27:49 +00:00
Seth Call 7f08e42d33 * also put promptLeave = false if the session is already over 2014-02-23 05:21:36 +00:00
Seth Call 23af96adbe * also set promptLeave to false when BACKGROUND_MOVE indicated VRFS-846 2014-02-23 05:15:26 +00:00
Seth Call df36417551 * VRFS-846 is likely handled; but can't test on mac due to bugs; going to try windows shortly 2014-02-23 05:04:04 +00:00
Seth Call f119007c86 * VRFS-1219 - don't show prompt if leaving session from the add audio gear dialog 2014-02-23 04:41:42 +00:00
Seth Call de24ba15bc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 02:26:33 +00:00
Seth Call acf8f84624 VRFS-1172 - easydropdown plugin thinkns client has touch support... but it doesn't 2014-02-23 02:26:19 +00:00
Brian Smith 53ac75c0e7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-22 13:44:44 -05:00
Brian Smith a2307e16b7 VRFS-658 warn user when navigating away from session 2014-02-22 13:43:11 -05:00
Seth Call f2e97625b4 * VRFS-729 - reset FTUE after Add new audio gear selected 2014-02-22 17:34:17 +00:00
Seth Call f1908627aa * VRFS-621 - help icons hidden 2014-02-22 08:22:01 +00:00
Seth Call 7704611d39 * VRFS-800 - client update is a proper dialog; and added concept of 'topmost' to force a certain dialog to the top 2014-02-22 07:20:53 +00:00
Seth Call dae0f40929 * removed is_downloadable for VRFS-1141, from database and UI
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
Seth Call 5ef992f881 * VRFS-1208; dropdowns close now 2014-02-22 03:14:07 +00:00
Seth Call 1c23b107e8 * fix broken user progression test now that new ftue is used for audio profile 2014-02-22 02:56:40 +00:00
Seth Call dbf350c528 * merging in ftue help article change 2014-02-21 22:04:04 +00:00
Seth Call 8ee250d550 * VRFS-560, VRFS-898, VRFS-597, VRFS-1153, VRFS-1154 - all ftue related fixes and improvements in user behavior. make new ftue show up everywhere instead of new ftue 2014-02-21 22:02:51 +00:00
Brian Smith b8d7453eda VRFS-793 alert user and prevent session join if there is no valid audio config 2014-02-20 23:15:23 -05:00
Brian Smith 4afac4bb64 VRFS-845 handle backend alerts 2014-02-20 22:46:54 -05:00
Jonathan Kolyer cb40419f76 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-21 00:32:38 +00:00
Jonathan Kolyer 91b05073d1 VRFS-684 added selection of first entry by default to support Enter key 2014-02-21 00:32:23 +00:00
Seth Call f3c09f65c2 * allowing tests to be skipped, and mostly done with VRFS-1200 2014-02-20 22:23:44 +00:00
Seth Call 9ca1149daf * fix accidental typo in hover-recording 2014-02-20 20:59:50 +00:00
Seth Call aab902e8cf * VRFS-1160 - favorites REST API done 2014-02-20 20:54:35 +00:00
Brian Smith 9bd673e67d VRFS-1185 fix piano and upright bass icons 2014-02-19 21:07:03 -05:00
Brian Smith 76d8e84a62 check for empty comment before posting 2014-02-19 20:35:34 -05:00
Brian Smith c95a650cdc add POST button to landing pages for comments, add like_count back to session model 2014-02-19 20:31:44 -05:00
Seth Call 857dd27404 * VRFS-1191, VRFS-1120, VRFS-1079, VRFS-1087, VRFS-1190, VRFS-1192--many band page changes, fixes. small fix for notification icons showing orange circle if icon_url not specified 2014-02-19 22:56:13 +00:00
Brian Smith 4e117745e2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-19 01:27:32 -05:00
Brian Smith 7a96a0e48e VRFS-1058 fix Join link issue and fix Listen link 2014-02-19 01:27:18 -05:00
Seth Call d5b7ec1a9b * focus email when you open signin dialog 2014-02-19 05:37:25 +00:00
Seth Call 665ec9b395 * remove debug log 2014-02-19 04:53:22 +00:00
Seth Call 2905245f1a * VRFS-1181 - upright bass in the mix 2014-02-19 04:40:37 +00:00
Seth Call 4e674b312c * VRFS-1171 - resolved by moving notification out of transaction 2014-02-18 22:35:23 +00:00
Seth Call 72d19e0f48 * easydropdown-ing the dropdowns in session settings dialog 2014-02-18 20:38:41 +00:00
Seth Call 18988c05fd * VRFS-1170 - default to public-ish settings 2014-02-18 20:32:54 +00:00
Seth Call 7449de7aad * fix test bugs, get VRFS-1135 sorts resolved, and fix for easydropdown not destroying topmost div 2014-02-18 18:53:16 +00:00
Seth Call de294d19bb * VRFS-1135; music session history has creator, participants, and band info now. 2014-02-18 14:24:32 +00:00
Jonathan Kolyer 15f60d8b4f changed SessionSetConnectionStatusRefreshRate default to 1000 milliseconds 2014-02-18 01:31:33 -06:00
Jonathan Kolyer 3b8e564495 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 01:27:40 -06:00
Jonathan Kolyer 6dc6d1b52d VRFS-1110 fixed selection behavior and styling for autocomplete 2014-02-18 01:27:02 -06:00
Brian Smith c196ad8711 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 02:25:06 -05:00
Brian Smith a471e67a84 VRFS-1030 fix menu hover sensitivity 2014-02-18 02:24:56 -05:00
Daniel Weigh bb68fbf596 VRFS-1028 - Fixed an issue where a user has no instruments.
This is probably an edge case, but Test User (id: 1) has no instruments,
so this was not rendering and throwing a javascript error.
2014-02-18 02:15:44 -05:00
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