Commit Graph

4279 Commits

Author SHA1 Message Date
Seth Call c92bc8fdc1 Merge branch 'feature/social_buttons' into develop 2014-08-19 12:32:32 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00
Seth Call 5ae975c097 * merged 2014-08-15 09:40:39 -05:00
Seth Call 80c7d5b049 * VRFS-2049 - more guards in jamServer.js against runaway clients 2014-08-15 09:40:04 -05:00
Seth Call e1edeef7ae Merge branch 'feature/runaway' into develop 2014-08-15 09:33:38 -05:00
Seth Call e415083916 * wip 2014-08-15 09:32:47 -05:00
Brian Smith 25e3f23dcf VRFS-1891 VRFS-2022 bug fixes / test additions 2014-08-15 00:32:45 -04:00
Brian Smith af1a4596e0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-08-14 23:57:51 -04:00
Seth Call 5bdbbc5875 * wip 2014-08-14 22:53:39 -05:00
Seth Call d34929d70b * landing pages in VRFS-2037 2014-08-14 22:23:22 -05:00
Seth Call 90f1c253dd * VRFS-2037 - landing pages done 2014-08-14 22:21:34 -05:00
Seth Call 884a5bdc6e * wip 2014-08-14 21:31:34 -05:00
Seth Call b9a5c75ec5 * VRFS-2055 - escape keyword in hand-crafted SQL query\! 2014-08-14 21:28:30 -05:00
Seth Call 5f1952f08d * VRFS-2054 - change primepump timeout time to 11 seconds 2014-08-14 18:52:19 -05:00
Seth Call 3e52a03604 * VRFS-2054 - be nicer when we fail the primePump phase 2014-08-14 17:24:46 -05:00
Seth Call 134826c1ff * VRFS-2053 - fixed 2014-08-14 16:54:36 -05:00
Seth Call e4a8ce3759 * fix broken admin test 2014-08-14 14:08:35 -05:00
Seth Call 30b2c1bb53 * VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections 2014-08-14 13:16:38 -05:00
Seth Call 5c9f0da222 * make it possible to only see diagnostic info in the admin feed, and further diagnostic info of a certain type 2014-08-14 12:44:46 -05:00
Seth Call 154e2954d2 * VRFS-2045 - remove debug log 2014-08-14 11:35:51 -05:00
Seth Call 776704fdf5 * VRFS-2045 - guard against too many concurrent connections 2014-08-14 11:35:17 -05:00
Seth Call 322cdad87d * wip 2014-08-14 10:09:33 -05:00
Brian Smith 6a1d1daa9b Merge branch 'develop' into hotfix/cancel_rsvp_flow 2014-08-14 02:14:08 -04:00
Brian Smith 4b93b23282 VRFS-2022 fix tests 2014-08-14 02:11:36 -04:00
Brian Smith 5691e6092f VRFS-2022 show private sessions/recordings in the feed 2014-08-14 01:45:37 -04:00
Seth Call 90ec0b3f1a * fix admin tests 2014-08-13 15:32:51 -05:00
Seth Call 1688bdb5cf * landing page wip 2014-08-13 15:26:34 -05:00
Seth Call edc805e442 * VRFS-2040 - pass in retry value to backend 2014-08-13 12:51:40 -05:00
Seth Call 4c85740597 * wip 2014-08-13 11:09:52 -05:00
Brian Smith e8847280bc VRFS-1995 do not send notifications to users with canceled RSVPs 2014-08-12 02:20:25 -04:00
root d28301c974 Merge branch 'fix_sidebar_chart_height' into develop 2014-08-12 07:52:59 +02:00
Brian Smith da12798d19 VRFS-1562 avatar within musician/band hover bubble should link to profile 2014-08-12 01:37:11 -04:00
Brian Smith 257e14ef5d VRFS-1478 fix text 2014-08-12 00:46:05 -04:00
Brian Smith dece2afc1b VRFS-1478 fix bugs 2014-08-12 00:24:57 -04:00
Brian Smith 5483078f82 VRFS-2026 fix instrument wrapping of instrument icon in some cases on Find Session screen 2014-08-11 21:02:42 -04:00
Seth Call b8c09b912e * fake commit to poke jenkins 2014-08-10 09:29:23 -05:00
root dcbdddde3c fix sidebar height issue, request sent button issue 2014-08-10 08:30:47 +02:00
Brian Smith cc26969f8a VRFS-1891 cancel RSVP flow fix 2014-08-09 23:22:17 -04:00
Brian Smith fd9893ca42 Merge branch 'develop' into hotfix/cancel_rsvp_flow 2014-08-09 18:35:23 -04:00
Brian Smith 75d1efffeb VRFS-2019 updated News section 2014-08-09 18:34:16 -04:00
Seth Call 3b6225c539 * prune the log cache from the right direction in the array 2014-08-08 13:05:27 -05:00
Brian Smith f97a416867 VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog 2014-08-08 02:22:32 -04:00
Brian Smith d40b29a947 VRFS-1971 escape HTML before saving / unescape before rendering 2014-08-07 00:50:10 -04:00
Seth Call 18ac90d624 * VRFS-2010 - profile sees older session/recordings 2014-08-06 16:52:40 -05:00
Seth Call 38c4f4f022 * pass in numClientsToTest - 1 2014-08-06 16:41:27 -05:00
Seth Call 36043ec631 * make the packet size configurabel 2014-08-06 08:11:07 -05:00
Jonathan Kolyer 9249e99581 added method min_create_date 2014-08-05 12:09:12 +00:00
Brian Smith 199ef029bc merge develop 2014-08-04 22:38:59 -04:00
Seth Call ee442d803d * merge 2014-08-03 21:40:27 -05:00
Seth Call e871cc5390 fix latency presention - divide by 2 then round 2014-08-03 21:38:53 -05:00