Commit Graph

1496 Commits

Author SHA1 Message Date
Steven Miers dffdb78f71 Merge develop into this branch. 2014-10-06 16:17:36 -05:00
Seth Call 2d6f2e606d * remove console.trace; IE 10 breaks on it 2014-10-03 11:31:29 -05:00
Seth Call 0fdb932db1 * VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin 2014-10-02 14:04:36 -05:00
Anthony Davis f58a410233 VRFS-2289 - reclaim 21px 2014-09-30 22:32:55 -05:00
Brian Smith 6442674c91 VRFS-2216 fix tests; include pending RSVPs and invites for session details screen 2014-09-28 22:37:52 -04:00
Brian Smith e7a719ffd1 VRFS-2278 added spinner while retrieving session details 2014-09-28 21:29:37 -04:00
Seth Call 0e274e8687 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-09-28 13:14:16 -05:00
Seth Call 3d169d083e * rename to geoiplocation 2014-09-28 13:14:06 -05:00
Brian Smith 5159480eb8 VRFS-2265 include alert.js in web.js and landing.js 2014-09-28 12:35:22 -04:00
Brian Smith a07fdfe2a8 Merge branch 'develop' into feature/sprint_12_work 2014-09-28 12:00:32 -04:00
Seth Call 83b1777e65 * ga tracker code for display/remarketing VRFS-2242 2014-09-26 17:13:04 -05:00
Seth Call 39ed460d14 * VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data 2014-09-25 23:13:34 -05:00
Brian Smith da771acdaf merge develop 2014-09-25 09:09:44 -04:00
Brian Smith 2a2445bcba VRFS-2067 fix bug where latency badge was missing for in session users 2014-09-25 09:08:01 -04:00
Seth Call 0b85d00825 * fixing some package issues with websocket-gateway 2014-09-24 20:52:09 -05:00
Seth Call e0796de694 * adding connect with musicians video 2014-09-23 21:17:10 -05:00
Brian Smith 3f1eb86684 Merge branch 'develop' into feature/sprint_12_work 2014-09-23 21:27:52 -04:00
Seth Call 14043f164e * VRFS-2225 - fix for profile whacking 2014-09-22 20:35:23 -05:00
Seth Call 63425fe1ff * make prod bubble show up if 0 or 1 profiles 2014-09-22 15:58:14 -05:00
Seth Call 84e1846e75 * fixing help template text 2014-09-22 15:57:35 -05:00
Seth Call 7645acac72 * VRFS-2249 - protect against less than 1 2014-09-22 14:24:44 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Brian Smith d90114dbbb session name text should link to session landing / info pages 2014-09-20 16:22:52 -04:00
Brian Smith 2c7c43c3aa VRFS-2118 hide play button for private recordings 2014-09-19 01:17:56 -04:00
Brian Smith 7bcdf23caa VRFS-2185 default session landing to pause icon 2014-09-19 01:14:44 -04:00
Brian Smith f4327a7746 fix tests 2014-09-19 01:12:22 -04:00
Brian Smith 37be35275b hide end of list message while searching 2014-09-19 00:20:45 -04:00
Brian Smith 9ae3fb1f45 Merge branch 'develop' into feature/sprint_12_work 2014-09-17 21:32:48 -04:00
Brian Smith ee38e8f2cc VRFS-2067 fix issues with RSVP expand / collapse 2014-09-17 21:32:16 -04:00
Seth Call 609846c295 * VRFS-2204 - udp_reachable showing now 2014-09-17 20:31:58 -05:00
Seth Call f9c751605c * VRFS-2016 - potential fix for flapping connections 2014-09-17 17:19:35 -05:00
Brian Smith 1f99ebef89 VRFS-2067 expand / collapse RSVP musicians and latencies when there are more than 3 2014-09-17 12:49:58 -04:00
Seth Call 9b6715d101 * remove debugging heartbeat 2014-09-17 10:43:52 -05:00
Seth Call 0db38e17d6 * adding tests for VRFS-2221 2014-09-17 10:22:05 -05:00
Brian Smith 692416e27f VRFS-2067 VRFS-2163 expand / collapse open slots, add All Languages option to language filter 2014-09-17 03:14:43 -04:00
Seth Call 4793ea701a * VRFS-2209 - fix progress bar by fixing the update size variable. also show countdown 2014-09-16 21:14:16 -05:00
Seth Call 169f97fdc3 * fix bad support blurp 2014-09-16 21:47:59 -04:00
Seth Call 74ac15c8a1 * make better alert about no network server 2014-09-16 21:47:39 -04:00
Brian Smith 1203a26271 Merge branch 'develop' into feature/opt_out_notification_fix 2014-09-15 23:02:53 -04:00
Seth Call 7c3530a403 * fix how we check if udpReachable 2014-09-15 14:09:49 -05:00
Seth Call d2cd527f10 * fix preferences window not showing 2014-09-15 07:45:17 -05:00
Seth Call 35dd53469d * VRFS-2164 - fix for missing tracks on record 2014-09-14 21:55:43 -05:00
Brian Smith 99ad394633 VRFS-2066 fix tests 2014-09-14 21:54:12 -04:00
Brian Smith 4ddd4e4c13 VRFS-2066 fixed some issues with session landing and feed 2014-09-14 19:17:16 -04:00
Brian Smith f296932f27 fix more session join/leave bugs 2014-09-14 15:12:25 -04:00
Brian Smith e5a6ad862b fix notification bugs - active_music_session vs. music_session confusion 2014-09-14 14:41:32 -04:00
Brian Smith 7290188681 refactored code related to joining a session (Terms / Join Request dialog display logic) into SessionUtils 2014-09-14 14:16:48 -04:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call 770d0acd42 * VRFS-1505 - adding sorting to genres in controller 2014-09-12 06:29:10 -05:00
Seth Call 75d50b8286 * make notations private bucket; only allow access if user has can_join? permissions for session 2014-09-08 16:51:28 -05:00