Commit Graph

2608 Commits

Author SHA1 Message Date
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 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 0f29d020a9 * oops fixed a typo in recording reorg 2014-02-04 23:17:38 +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 4549282f0d * trying no-https rubygems for a bit, see if it helps build 2014-02-04 21:53:37 +00:00
Seth Call 11c5c8723b * changing url to mp3_url and ogg_url in rabls 2014-02-04 21:49:33 +00:00
Seth Call 636ca9b891 * VRFS-1076 - fix for leave session being broken 2014-02-04 21:45:34 +00:00
Seth Call 8c1e2c5df6 * backend handles these notfications already VRFS-1067 2014-02-04 21:21:51 +00:00
Seth Call dab9063fb9 * backend handles these notfications already VRFS-1067 2014-02-04 21:20:30 +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 9526be15ad * finish renaming back ShareDialog 2014-02-04 18:25:53 +00:00
Seth Call 103954cb96 * VRFS-1074 - create run folders for pids on every upstart start 2014-02-04 18:18:15 +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 c3a51989fd * changing to localhost:3000 instead of jamkazamdev.local 2014-02-04 14:40:05 +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 7797b6907c vrfs152: added GA tracking for FB invites 2014-02-04 01:16:16 -06:00
Jonathan Kolyer 3414229384 vrfs152: added test to allow multiple signups with a fb invite 2014-02-04 01:12:34 -06:00
Seth Call dc70f349b6 * overlay-small i being pulled 150px to the left 2014-02-04 03:16:39 +00:00
Seth Call ea19fe002d * VRFS-1026 and VRFS-1024 resolved (signin and dropdown scooted back 2014-02-04 03:06:46 +00:00
Seth Call d82b0b6fd9 * VRFS-1026 - putting user dropdown back to where it belonged 2014-02-04 02:45:52 +00:00
Seth Call d10f966c0b * VRFS-1025 finished 2014-02-03 21:19:34 +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 af553c1734 * adding fb image 2014-02-02 15:07:04 -06:00
Seth Call 05e5a8cc11 * working on signup on welcome page 2014-02-02 15:06:41 -06:00
Seth Call 513fb2b8d4 * intsall to vendor/bundle 2014-02-02 14:03:31 -06:00
Seth Call 821e8cc2b5 * fail on error 2014-02-02 13:57:41 -06:00
Seth Call 3ded3ff39c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-02 13:35:33 -06:00
Seth Call b256182cc6 * VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1 2014-02-02 13:34:53 -06:00
Jonathan Kolyer da9a001e43 fixed issues editing buzz entries 2014-02-01 21:59:25 -06:00
Jonathan Kolyer d92d02a361 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 21:52:40 -06:00
Jonathan Kolyer 61de77c7e1 vrfs152: fixed broken tests 2014-02-01 21:48:46 -06:00
Seth Call aaf4914885 VRFS-1054 removing reload slush 2014-02-01 20:46:38 -06:00