Commit Graph

2571 Commits

Author SHA1 Message Date
Seth Call d4a5737c51 * VRFS-1025 finished 2014-02-03 21:19:14 +00: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
Seth Call 5dc376fa23 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 20:46:04 -06:00
Seth Call 7f409c2cb4 VRFS-1054 removing reload slush 2014-02-01 20:45:58 -06:00
Anthony Davis a3f8d9288c VRFS-923 - deleting at the object level instead. works fine on my machine. 2014-02-01 19:30:23 -06:00
Seth Call a05a85aad7 * revert new welcome as root until can fix all the tests 2014-02-01 20:48:19 +00:00
Daniel Weigh 177220bae8 VRFS-1047 Implement the new landing page.
Setup core layout.
2014-02-01 14:26:16 -05:00
Seth Call 86b51b6b89 * in listen_in example page, specify preload=none to lessen load on sessions 2014-02-01 17:36:46 +00:00
Seth Call 6ae07fa187 * make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043) 2014-02-01 15:59:43 +00:00
Seth Call 68221090eb * marking pending a test that fails on mac, not linux 2014-02-01 05:02:56 +00:00
Seth Call 4e89a686e2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-01 04:51:49 +00:00
Seth Call 4ce77a44b3 * VRFS-1039 - add extension to mount name 2014-02-01 04:51:38 +00:00
Seth Call 4369e0ba9b * VRFS-1016 - pushing debians at end 2014-01-31 14:25:31 -06:00
Seth Call 6806d6f0d3 * VRFS-1016 2014-01-31 14:25:17 -06:00
Seth Call d5478dc926 * removing force:true in IcecastConfigWriter 2014-01-31 13:19:46 -06:00
Seth Call 3517cf048b * re-establish pg connection before/after fork 2014-01-31 12:37:43 -06:00
Seth Call 43d5c8465f * adding runtests helper 2014-01-31 12:09:44 -06:00
Seth Call 062b36ae82 * commenting out share_token 2014-01-31 11:23:05 -06:00
Seth Call c9b58229c4 * fixing broken tests some more 2014-01-31 10:04:17 -06:00
Seth Call 3d6069bdb3 * fix broken tests 2014-01-31 09:32:18 -06:00
Brian Smith edebf42e73 VRFS-1020 share dialog work 2014-01-31 01:39:09 -05:00
Brian Smith 42930fe95e fix header on client 2014-01-30 22:30:37 -05:00
Seth Call b4b120aa3b * removing first_recording_at method and allowing server_id to be modified 2014-01-30 20:43:35 -06:00
Seth Call f1a8c1b744 * remove first_recording_at method 2014-01-30 20:39:42 -06:00
Seth Call 2e5eb4fd7f * beefing up description in icecast_bootstrap 2014-01-30 20:13:09 -06:00
Seth Call a4902977a4 * marking tests broken 2014-01-30 20:10:06 -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
Seth Call 956b25c577 * fixing bug when icecast.xml exists VRFS-1010 2014-01-30 09:32:12 -06:00
Jonathan Kolyer b0a8da15b6 vrfs152: moved invited_users_facebook_support.sqlto bottom 2014-01-29 23:05:55 -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
Jonathan Kolyer e839c8cb69 vrfs152: moved generate_signup_url into invited_user 2014-01-29 22:48:35 -06:00
Jonathan Kolyer 4a1ebb7630 vrfs152: added test for facebook_invite! 2014-01-29 21:37:49 -06:00
Jonathan Kolyer a73d4d758d vrfs152: created one FB invite constraint 2014-01-29 21:22:37 -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
Seth Call 3903822ca5 * overriding lock timeout for LonelyJobs 2014-01-29 14:33:47 -06:00