seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
7,876 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

4171 Commits

Author SHA1 Message Date
Daniel Weigh 144f97f470 VRFS-935 Account identity screen borked. 2013-12-29 15:52:29 -05:00
Brian Smith 1806c5245f VRFS-933 notification work 2013-12-29 14:40:21 -05:00
Daniel Weigh 7bb4b4a3c8 VRFS-936 Session header bar missing 2013-12-29 13:14:50 -05:00
Brian Smith 7e78163bb9 VRFS-933 notification work 2013-12-28 23:51:35 -05:00
Anthony Davis 4a9ad7b733 VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures 2013-12-28 11:54:53 -06:00
Brian Smith 75b9b97c60 fix warning related to ruby- prefix in .ruby-version files 2013-12-27 16:28:28 -05:00
Jonathan Kolyer 8fa8895944 vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3 2013-12-21 22:01:25 -06:00
Seth Call d8a5dbd031 * making a test as pending that fails only on build server for now 2013-12-21 16:35:17 +00:00
Seth Call 182242c7fb * VRFS-856 - hopefully the fix 2013-12-21 15:12:25 +00:00
Seth Call 9943e4518b * oops. adding path to poltergeist gem 2013-12-21 02:43:55 +00:00
Seth Call 8deced77c7 * pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken 2013-12-20 23:44:12 +00:00
Seth Call a68235f280 * adding 'select' to dialog-inner so it'll look JKish 2013-12-20 22:24:14 +00:00
Seth Call 242016c38b * VRFS-821 - recordings manager changes 2013-12-20 22:01:51 +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 c0b5d63f55 * fixing steps typo 2013-12-18 21:58:11 +00:00
Seth Call f578a3b8ec * accidentally left out the security 'all-permissions' check 2013-12-18 18:09:36 +00:00
Seth Call de4a2c8321 * VRFS-821; sending loggedin/loggedout events to backend from frontend 2013-12-18 17:18:23 +00:00
Seth Call 69da7ffe1e * uncommenting all ping servers 2013-12-18 16:28:05 +00:00
Seth Call 267664d2bf * adding in updated jnlp files 2013-12-17 23:55:10 +00:00
Seth Call 463d7da0f2 * make tester page look a little more user-friendly 2013-12-17 22:34:31 +00:00
Seth Call d97a960a0e * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:21 +00:00
Jonathan Kolyer 3c8dbf4d80 Merge branch 'web_pages' into develop 2013-12-17 11:00:57 -06:00
Anthony Davis f442196f8d Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 22:07:48 -06:00
Anthony Davis daf9b38a9e VRFS-909 - pushing typo fix in legal email 2013-12-17 22:07:24 -06:00
Jonathan Kolyer 020f9d544e vrfs-884: tweaking layout 2013-12-17 10:59:16 -06:00
Jonathan Kolyer 4329338fa8 vrfs-884: added check for client_id==undefined in participant_delete method 2013-12-17 10:58:35 -06:00
Brian Smith 932de5cc35 VRFS-877 band photo bug fixes 2013-12-16 23:22:30 -05:00
Jonathan Kolyer d7a6253b76 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-16 20:32:31 -06:00
Jonathan Kolyer 60b59a88c7 vrfs-884: fixing tests for commit 2013-12-16 20:32:17 -06:00
Anthony Davis 64e0089960 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 14:43:08 -06:00
Anthony Davis aec6e52ace VRFS-907 - removed links to jeffkoke.com also fixing character 2013-12-16 14:42:34 -06: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
Jonathan Kolyer 9dd631d05a vrfs-884: added PARAM_BAND support 2013-12-16 12:29:16 -06:00
Jonathan Kolyer a354f6c6d5 vrfs-884: updating sample data for bands 2013-12-16 12:28:21 -06:00
Chris Doughty 7a3594a0cc Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-16 07:51:56 -06:00
Chris Doughty 836e786ebf Correcting staging cloudfront distribution with correct s3 bucket 2013-12-16 07:51:46 -06:00
Brian Smith 0431c40e93 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-15 22:53:34 -05:00
Brian Smith d583393598 VRFS-877 bug fixes 2013-12-15 22:53:16 -05:00
Chris Doughty f10d43e41f Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-15 20:08:59 -06:00
Chris Doughty d310484c3b VRFS-719 fixing error case where path is incorrectly built 2013-12-15 20:01:13 -06:00
Brian Smith 10d9232e3f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-15 16:27:24 -05:00
Brian Smith 5b5aef15c8 VRFS-877 band photo work 2013-12-15 16:27:11 -05:00
Anthony Davis 9de0d84106 adding: bands_spec (oops, was not git added) 2013-12-14 17:59:48 -06:00
Anthony Davis 4e273759ba adding: bands_spec, link ids, more in_session JS testing and refactoring 2013-12-14 17:53:18 -06:00
Chris Doughty b5efad954d Adding prd and dev cloudfront hosts 2013-12-14 13:07:38 -06:00
Chris Doughty c0a6541039 Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-12 20:47:33 -06:00
Chris Doughty fa8df410da VRFS-719 Added code to force downloads through cloudfront 2013-12-12 20:47:20 -06: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
Jonathan Kolyer 3968f4015a vrfs-884: added bands view layout 2013-12-09 13:55:02 -06:00
Jonathan Kolyer 2a93ce7caf vrfs-884: refactored search filter var names 2013-12-09 13:54:02 -06:00
Jonathan Kolyer 4c804d2f94 vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page 2013-12-09 07:15:59 -06:00
Brian Smith 6b4e42dfc5 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-08 22:32:02 -05:00
Brian Smith 833eb45379 VRFS-878 use IP address to default location for band setup 2013-12-08 22:31:49 -05:00
Daniel Weigh 1b77065826 VRFS-294 Resizing Create Session View tweaks for ~1024 px width. 
tweak to content-icon
 2013-12-08 13:07:36 -05:00
Daniel Weigh 0bad5573b2 VRFS-294 Resizing Create Session View tweaks for ~1024 px width. 
enables scrolling within the session container for short screens.
 2013-12-08 12:12:26 -05:00
Brian Smith 5856c5d176 VRFS-876 allow user to remove band members 2013-12-07 20:45:24 -05:00
Daniel Weigh c49406d467 VRFS-294 Resizing Create Session View tweaks for ~1024 px width 2013-12-07 12:31:02 -05:00
Seth Call 4f97753f47 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-05 11:16:26 +00:00
Seth Call 73087f0f7a * recordings manager - changes to download/upload REST APIs - VRFS-821 2013-12-05 11:16:21 +00: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
Jonathan Kolyer c3d49de7f1 vrfs-868: added auth_action route to enable GET-based actions requiring authentication 2013-11-28 06:15:22 -06:00
Jonathan Kolyer 1d0b07cbe1 vrfs-775: fixed arg handling in new musicians email 2013-11-27 23:35:16 -06: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 71eae1dbb2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-11-27 00:57:56 -05:00
Brian Smith 2cd70405e0 fix bug introduced in create session friend selector 2013-11-27 00:57:49 -05:00
Jonathan Kolyer 2c30b51048 Merge branch 'musicians_page' into develop 2013-11-26 09:01:08 -06:00
Jonathan Kolyer e57a276144 vrfs-775: added rake task; updating plain text email 2013-11-26 09:00:50 -06: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
Jonathan Kolyer 2748588caa testing updates 2013-11-25 15:56:54 -06:00
Jonathan Kolyer 114daf2818 vrfs-774: replaced raw HTML with rails helpers 2013-11-23 16:54:01 -06:00
Jonathan Kolyer b50c46dd32 vrfs-774: converted raw html into rails helpers 2013-11-23 16:25:27 -06:00
Brian Smith 2586601a17 fix test 2013-11-23 15:38:34 -05: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 9efefb485e vrfs-774: refactored api tests; added geocoding support 2013-11-23 06:17:58 -06: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 5b21a8b1b8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-11-21 01:24:53 -05:00
Brian Smith 69bf50ff28 VRFS-689 band setup work 2013-11-21 01:24:40 -05:00
Jonathan Kolyer a8f68c6396 Merge branch 'develop' into musicians_page 2013-11-16 15:10:39 -06:00
Jonathan Kolyer 9265a2c413 vrfs-774: fixed styles in musician page 2013-11-16 15:10:11 -06:00
Seth Call f74ef61965 * trying reset sessions 2013-11-16 19:35:01 +00:00
Seth Call 7f4c15ea87 * fixing recording feature tests 2013-11-16 18:51:54 +00: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 555d4f1139 vrfs-774: added orderby for plays/playing; ui tweaks 2013-11-15 16:35:55 -06:00
Jonathan Kolyer a8160cca5c vrfs-774: implementing musician search result actions like/follow/friend 2013-11-15 14:03:03 -06:00
Jonathan Kolyer 673507458c vrfs-774: changed blank search critieria to allow multiple results 2013-11-15 13:54:54 -06:00
Jonathan Kolyer 2783336e65 vrfs-774: changed city for Kolyer to Austin 2013-11-15 13:53:34 -06:00
Jonathan Kolyer 2c7d7bb5a4 Merge branch 'develop' into musicians_page 2013-11-14 11:57:05 -06:00
Jonathan Kolyer a097fdbd98 vrfs-774: fixed broken test; fixed bug editing distance text 2013-11-14 11:56:20 -06:00
Anthony Davis ecdc5dfe05 Build failing, out of memory. Disabling the four-client test 2013-11-13 08:35:26 -06:00
Anthony Davis cd912c9b48 VRFS-850 adding integration tests and refactoring utilities. 2013-11-13 00:58:28 -06:00
Anthony Davis 64509f8592 VRFS-829 + adding "in session" tests. will watch Jenkins... 2013-11-11 22:57:04 -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 d33b6d13fb Merge branch 'develop' into musicians_page 2013-11-05 19:14:21 -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
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
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
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
Anthony Davis cfb6a6133f adding optional 'fog' dependency 'unf' to suppress warnings 2013-11-05 20:03:43 -06: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 f4401fc36a * wip 2013-11-05 02:25:03 +00:00
Jonathan Kolyer d6e4732604 vrfs-774: musician instrument api search 2013-11-04 10:18:57 -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
Jonathan Kolyer 462e4034ec vrfs-774: changed Montana to MT for geocoding 2013-11-04 01:45:19 -06:00
Jonathan Kolyer a8dbca3552 Merge branch 'develop' into musicians_page 2013-11-03 23:43:21 -06:00
Jonathan Kolyer f192bb8d56 vrfs-774: incremental ui edits 2013-11-03 23:42:02 -06: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
Seth Call aea3434d02 * VRFS-831 - looks finished 2013-11-03 15:23:46 -06:00
Jonathan Kolyer 2b19744683 vrfs-774: replaced original max_geo_isp db cols 2013-11-03 02:45:54 -06:00
Jonathan Kolyer 291a3a8ac2 vrfs-774: changing country value from USA to US for max_mind_geo support 2013-11-03 01:49:10 -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 9f09674d77 vrfs-774: added geokit-rails and postgres_ext for geocoded user searches 2013-10-28 21:44:14 -05: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
Jonathon Wilson 1d168257d0 Visual work for new FTUE screen 2013-10-27 18:37:55 -06: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
Seth Call 54a371a859 Merge branch 'master' of bitbucket.org:jamkazam/jam-cloud 2013-10-25 07:19:52 -05:00
Seth Call 77d38a41a8 * I can't keep straight what's pending and what's not 2013-10-24 14:59:21 -05:00
Seth Call 3afeb75297 * fixing path for /client prefix 2013-10-24 14:57:58 -05:00
Seth Call 087d4e62c5 * music_session_spec fails too much on build server. marking pending for all ests 2013-10-24 13:27:11 -05:00
Seth Call 48f7441bb3 * music_session_spec fails too much on build server. marking pending for all ests 2013-10-24 13:24:06 -05:00
Jonathan Kolyer 2a76abccf4 vrfs-492: disabled tests to avoid build failures 2013-10-24 12:40:02 -05:00
Jonathan Kolyer fec91d1e99 merge conflict 2013-10-24 12:29:37 -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 e843989e76 * VRFS-644 jamkazam custom png added 2013-10-23 11:39:49 -05:00
Seth Call 299d24e992 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-23 11:32:31 -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 362a76653d * VRFS-796 - fixed by removing email_confirmed restirction on show/index user APIs 2013-10-23 16:22:15 +00: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
Anthony Davis 959af51f27 VRFS-792 - nudge "change avatar" link in account page 2013-10-22 20:40:31 -05: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 7a710a64c0 * fix broken music_session test because I enforce 'client' prefix everywhere 2013-10-22 13:06:04 -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 fe5d579e67 * VRFS-780; forgot images 2013-10-21 17:14:15 -05:00
Seth Call 32a4297569 * VRFS-780 - finished, tested, etc 2013-10-21 17:13:53 -05:00
Seth Call 4b455b6d77 * removing extra 'it's which only add more test count but slower tests 2013-10-21 11:32:05 -05:00
Seth Call ed2303b916 * VRFS-790; removing database cleaner before every test to fix alter table collisions, as well as speed up tests 2013-10-21 11:13:00 -05:00
Jonathan Kolyer e954132043 vrfs-492: running test to detect random failures 2013-10-20 22:50:32 -05:00
Seth Call 00308c2c73 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-20 14:31:48 -05:00
Seth Call 2d29aa483f * addng the 'you have registered as a fan' info' 2013-10-20 14:24:59 -05:00
Anthony Davis 61ae54048a typos 2013-10-19 23:45:43 -05:00
Anthony Davis 9c00d65b2f Merge remote-tracking branch 'origin/develop' into develop 2013-10-19 23:04:26 -05:00
Anthony Davis bd478a2f5a Fix find sessions spec for Jenkins 2013-10-19 23:00:40 -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 94eac00783 * marking failing tests as pending 2013-10-19 15:11:44 -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
Anthony Davis 199619edf1 Removing errant beta character 2013-10-16 23:56:03 -05:00
Anthony Davis a641496261 Merge remote-tracking branch 'origin/develop' into develop 2013-10-16 23:53:07 -05:00
Anthony Davis 09e046e033 Cleaned up/sped up two-session test 2013-10-16 23:52:41 -05:00
Brian Smith 0517ae9ba3 VRFS-758 fix unit test - still need to clean up message 2013-10-16 21:39:00 -04:00
Jonathan Kolyer 9341b077e3 vrfs-492: added sleep in second-to-last tests 2013-10-15 15:33:26 -05:00
Jonathan Kolyer fc8fc068d7 vrfs-492: merge conflict fix 2013-10-15 14:54:11 -05:00
Seth Call dffab0bc71 * marking connection failing test as pending for now 2013-10-16 11:26:00 -05:00
Seth Call 482c2cece3 * VRFS-773 - isp page avaible 2013-10-16 11:20:37 -05:00
Seth Call f7d31668d4 * marked pending to clear up builds VRFS-758 2013-10-16 09:56:22 -05:00
Jonathan Kolyer 282c43eca8 vrfs-492: added second-to-last-person test cases; refactored test methods; added contexts 2013-10-15 14:50:57 -05:00
Seth Call 24286b621e * VRFS-772; the client launches but it doesn't do or say anything. I don't think it's due to web problems, thoug 2013-10-15 13:57:15 +00:00
Seth Call e0a00e9fda * VRFS-772; partly done; I need to switch to mac to test 2013-10-16 06:22:33 -05:00
Brian Smith 0dab797948 VRFS-758 change dialog title 2013-10-16 04:09:43 -04:00
Brian Smith 8f21ead048 VRFS-758 bug fixes 2013-10-16 04:07:30 -04:00
Brian Smith a0f4dd9e0b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-16 03:23:51 -04:00
Brian Smith 6dd0df75d9 VRFS-758 join request notification logic 2013-10-16 03:23:43 -04:00
Anthony Davis 7b481516de Getting latest from repo before pushing new RSpec test 
Merge branch 'develop' of ssh://bitbucket.org/jamkazam/jam-cloud into develop
 2013-10-16 01:17:01 -05:00
Anthony Davis a67eee6ca4 Prototype two-client headless Create/Find Session test 2013-10-16 01:15:34 -05:00
Jonathan Kolyer b4aa568351 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-15 08:37:14 -05:00
Jonathan Kolyer c9618ba816 vrfs-492: fixed breaking tests for single user session 2013-10-15 08:35:11 -05:00
Jonathan Kolyer 90160381b6 added id=session-leave to LEAVE link 2013-10-15 02:59:00 -05: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 2888d4989a * VRFS-770 - add context.ga if a developer build of the client 2013-10-10 01:34:19 +00:00
Seth Call 025ae0cdc8 * VRFS-770 - easy fix; if a developer client build, make sure to create a context.ga 2013-10-10 01:32:35 +00:00
Seth Call 035a1213d7 Merge branch 'develop' 2013-10-08 10:19:43 -05:00
Jonathan Kolyer f9068c63e4 VRFS-743: changed perf data link timeout to 25 years 2013-10-07 10:29:21 -05:00
Seth Call f193e3f325 * VRFS-766 - fixed broken footer links in landing pages 2013-10-08 16:05:19 -05:00
Jonathan Kolyer 68a42393e7 VRFS-743: changed expires date to 90 days for perf data link 2013-10-07 00:22:20 -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 6ab0c1383d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-04 13:32:40 -04:00
Brian Smith 28d9ae3f34 VRFS-755 fix javascript error 2013-10-04 13:32:23 -04:00
Anthony Davis c93aa7bf3f VRFS-665 - adding CSS to take precedence over user agent stylesheet 2013-10-04 00:02:46 +00:00
Seth Call 71349e0e2b * VRFS-749 - simple admin smoke test added 2013-10-03 13:51:57 +00:00
Seth Call 2ec38a81ac * VRFS-749 - hotfix by adding stub function for ga function 2013-10-03 13:00:24 +00:00
Seth Call af94c3ad21 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-10-03 12:58:49 +00:00
Seth Call ff602e4294 * VRFS-749 - fix by adding stub function 2013-10-03 12:58:39 +00: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 b74ab7fda9 * removing helper to resolve remote_ip, and doing it the 'rails' way 2013-10-01 21:49:41 +00:00
Seth Call 2e27773511 * VRFS-734 some tests for downloading 2013-10-01 20:20:33 +00:00
Seth Call ea1f6fb17b * VRFS-746 - add config to read X-Real-IP instead of request.remote_ip 2013-10-01 18:57:02 +00:00
Seth Call 79f458d6d5 * VRFS-622 - added search filter 2013-10-01 17:54:53 +00:00
Seth Call 562b93ff4b * adding chris as a devuser 2013-10-01 12:04:17 +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 d7ada2d7d3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-27 21:42:27 +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 909574242f * marking perf upload test as pending until fixed 2013-09-27 15:09:11 +00:00
Seth Call 71710f1ce8 * VRFS-711 - added test to prove that the welcome email comes back after you click signup confirm 2013-09-27 14:54:51 +00:00
Seth Call b8eefb717c * add george as a dev user 2013-09-27 11:51:50 +00:00
Seth Call 785810cf96 * VRFS-711 - completed, need at least one test though for cold signup path 2013-09-27 04:08:10 +00:00
Seth Call a0a90a0eeb * VRFS-710 tests 2013-09-27 02:45:40 +00:00
Jonathan Kolyer 23359a3fb2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-23 19:59:06 -05:00
Jonathan Kolyer edd278575a VRFS-575: reopened ticket: changed relationships of perf_data and ms_user_history; got spec test passing 2013-09-23 19:58:59 -05:00
Seth Call b40e240cd4 * VRFS-711 welcome email added; also, VRFS-725 fixing signout 2013-09-26 17:33:28 +00:00
Seth Call f9f012cdc8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-26 14:07:27 +00:00
Seth Call cf907cc060 * VRFS-711 - adding new welcome email with useful links 2013-09-26 13:43:02 +00:00
Seth Call fc13f47ce0 * VRFS-710 fixed invite a friend to Invite More Friends 2013-09-25 15:59:19 +00: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
jam b5cd965089 Add callback to register user name 2013-09-24 02:22:41 -05: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 5bbea091bb * VRFS-695 - GA integrated trivially for all 3 environments 2013-09-23 18:06:25 +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 e3f4146131 * VRFS-702 - adding a simple 'does this page load at all' to each corp page 2013-09-22 02:33:00 +00:00
Seth Call 6477bbb867 * VRFS-702 - fixing cookie policy page 2013-09-22 01:35:50 +00:00
Seth Call 022085c8c8 * VRFS-699 bugsnag added to javascript 2013-09-22 01:25:20 +00:00
Seth Call ba0e600293 * VRFS-699; adding bugsnag to websocket-gateway as well, and hook up EventMachine errors in jam-web 2013-09-21 20:43:40 +00:00
Seth Call 11728893a3 * adding bugsnag initializer 2013-09-21 20:14:16 +00:00
Seth Call 852f2499e6 * VRFS-699 - initial integration into jam-web 2013-09-21 19:10:39 +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
Seth Call 17fade7bf0 * VRFS-694; adding newrelic to websocket. only real thing we get here is database monitoring 2013-09-18 22:11:32 +00:00
Seth Call b4082c88ae * bumping gems to be version 0.1.X to match debs 2013-09-18 20:35:20 +00:00
Seth Call a2ab44648b * VRFS-694 adding newrelic to rails 2013-09-18 20:14:37 +00:00
Seth Call 0d9a93418a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-18 15:23:32 +00:00
Seth Call fca15af824 * fix for typo found in perf_data upload to S3 (VRFS-690); also removing old config relating to perf_data_bucket_key 2013-09-18 15:23:22 +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 0dfd122316 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-17 00:06:47 -04:00
Brian Smith 99774759cc VRFS-677 mark chat devices as unassigned 2013-09-17 00:06:31 -04:00
Seth Call e0980d5336 * VRFS-606 - disable text selection in in-session and ftue 2013-09-17 02:20:22 +00:00
Seth Call e76fc73595 * VRFS-438 - squirt out BUILD_NUMBER into file and make debian packages reference it when it starts the app so that gem versions can be found 2013-09-16 17:03:26 +00:00
Seth Call 85cac2a014 * fixing more path changes 2013-09-16 02:36:21 +00:00
Seth Call 1082a7386a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-16 02:28:52 +00:00
Seth Call 4d723bacaf * fixing relative paths in gems for develop branch as well 2013-09-16 02:28:44 +00: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 24315d63f1 * fixing relative paths of gems VRFS-438 2013-09-15 18:42:14 +00:00
Seth Call a112391be1 * VRFS-438; collapsing all repos into one; requires modification of build files 2013-09-15 18:15:16 +00:00
Seth Call eba03124d4 * VRFS-438; collapsing all repos into one; requires modification of build files 2013-09-15 18:13:31 +00:00
Seth Call 2f41675471 merging jam-web into web 2013-09-15 18:04:37 +00:00