Commit Graph

25 Commits

Author SHA1 Message Date
Mark Ericksen 7b8fe27e82 redesign conferences index page and edit form
fixes CNVS-5985, CNVS-5661

testing instructions
=====================
on the conferences page:
* create a new conference
* can edit and update an existing conference
* can delete a conference
* after deleting all conferences in a group,
  the text showing "no conferences" should appear
* web conference type selection is disabled
  but visible when there is only 1 conference type
* conference type selection is visible and enabled
  when there are multiple types to choose from.
* concluded conferences can be deleted
* users should not be able to update or delete
  when they don't have permission
* long running conference that is started
  should show the "Join" button and the
  "End" button that will close the conference.

Wimba Conferences:
* "Manage Advanced Settings..." link
  shows up for and does not appear for other
  conference types

BBB Conferences:
* make sure the "recording" checkbox appears and
  is persisted properly
* test recording and playback of BBB conferences

Change-Id: Id97e9d4bdc509396b6d995a2b18e600f9426aba2
Reviewed-on: https://gerrit.instructure.com/20939
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Jon Willesen <jonw@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2013-06-01 00:18:37 +00:00
Jon Willesen 5a4a84a487 add back-end recording to big blue button conferences
fixes CNVS-5660

test plan:
 - setup the BBB conferences plugin.
 - create a new BBB conference, and click the checkbox to record
   the conference.
 - start the conference, do some stuff, logout, and then wait a
   few minutes.
 - start script/console and find the conference you just
   created: `wc = WebConference.find(1234)`
 - in the console, type `pp wc.recordings; nil`
 - you should see a recording_id, a duration_minutes, and a
   playback_url.
 - copy-and-paste the playback_url into your browser. you
   should go to the BBB playback page and be able to view the
   recorded conference.

Change-Id: I326ac25ef0280350a85a37215a5659fc6a827151
Reviewed-on: https://gerrit.instructure.com/20783
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
QA-Review: Jon Willesen <jonw@instructure.com>
2013-05-28 16:20:30 +00:00
Cody Cutrer 8c94e53dc7 arel-ify scopes
s/named_scope/scope/g

refs CNVS-4707

Change-Id: I930d229fc9985c7c0096a0f4888933addd4f3aee
Reviewed-on: https://gerrit.instructure.com/18834
Reviewed-by: Duane Johnson <duane@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-04-01 21:57:16 +00:00
Eric Berry e0460850f0 integrated adobe connect gem
fixes CNVS-3418

test plan:
  - create a conference room and start/enter it
  - in a different browser (or private) log in as someone else and
    join the same conference
  - ensure that both people can connect to the conference

Change-Id: Id043e2c69a1fea13197cccffc8fda5f41b798718
Reviewed-on: https://gerrit.instructure.com/17709
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-15 17:39:22 -07:00
Cody Cutrer 43f33049e3 only send conference invitations to active members fixes #5290
test plan:
 * create and publish a course
 * invite and accept a student
 * change the course dates to the future, and restrict access to
   them
 * create a web conference
 * the student should not get a notification

Change-Id: I06b0226c01fd38f99afed0ce767e9e7207864fbe
Reviewed-on: https://gerrit.instructure.com/10288
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2012-04-26 14:19:50 -06:00
Jon Jensen af9587874e let students join inactive long-running conferences, fixes #7454
added a :resume permission so participants can join long-running
conferences even if they go inactive

test plan:
1. set up wimba (or bbb)
2. create a conference with a duration
3. confirm that students can't join unless it's active (in the case of
   wimba, that means an admin needs to be in the conference. for bbb,
   an admin needs to have been present in the last hour)
4. create a long running conference (no duration)
5. confirm that students can join any time after it was started,
   regardless of whether the admin is still participating

Change-Id: Ie81ea7309b6334d88269af098f3b0da6fb04a177
Reviewed-on: https://gerrit.instructure.com/9433
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-03-19 16:50:33 -06:00
Brian Palmer 0432c66a24 remove deprecated ruby syntax
these are syntax errors in 1.9.x

Change-Id: I7cbd66643cb371e4be9f8da0365bf1e988ee5de8
Reviewed-on: https://gerrit.instructure.com/5833
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 10:28:22 -06:00
Jon Jensen 1247d10f30 wimba advanced settings link, closes #5291
Change-Id: I63b00d6ca1dc5bd949e07084cbf11057201917fa
Reviewed-on: https://gerrit.instructure.com/5264
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-25 15:11:52 -06:00
Cody Cutrer b01bc2fc0b don't always show Wimba conferences fixes #5071
check for presence, validity, and enabled of settings as whole,
rather than if any settings (including defaults) exist

Change-Id: I33a7cbd2da645185cce7bbd7b154e27f28a0ddfe
Reviewed-on: https://gerrit.instructure.com/4899
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-04 09:41:27 -06:00
Cody Cutrer 7f5cc0693b optimize AdheresToPolicy
Basically, don't call a bazillion procs everytime you check_policy;
just the "given" statement.  Everything else is evaluated just once,
and cached on the class.  This does lose functionality (the ability
to access the instance inside of set_policy, and set methods), but
none of it was currently in use.

Change-Id: I736879d98beb4115a2e8c492931c755076291d08
Reviewed-on: https://gerrit.instructure.com/4665
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-07-14 13:25:28 -06:00
Jon Jensen edcefd9299 remove sti and controller action scoping
also fixed a couple dup key issues and other weirdness

Change-Id: I48272a136783c95819de3863f05be4250a4a6102
Reviewed-on: https://gerrit.instructure.com/4223
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-16 08:25:51 -06:00
Jon Jensen 58a25bd462 preliminary i18n setup, closes #4124
* i18n key scoping for controller/model/js/etc.
 * inline English translation support
 * rdiscount gem for markdown'ed translations
 * html_safe interpolation tweaks
 * label helpers
 * crummy tweak to translate symbol keys
 * internationalized most of lib, and some plugins/messages
 * conference i18n (view/model/controller/js)

Change-Id: I42772b9e19a110efbe855dc83a681be49ec98df2
Reviewed-on: https://gerrit.instructure.com/4080
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-06 14:19:03 -06:00
Jon Jensen af4387b2b1 rework conference timestamp updating, fixes #4731
Change-Id: Icac60e494136fc7eae6ebdd07494c2f255f91265
Reviewed-on: https://gerrit.instructure.com/3968
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-06-02 12:59:38 -06:00
Jon Jensen e44cfb2c90 long running web conferences, closes #4228
Change-Id: Ica373ebc48edf3575d49d49071bfa878b5b15d3f
Reviewed-on: https://gerrit.instructure.com/3791
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-26 09:56:38 -06:00
Cody Cutrer bdbebfaec8 check all models for protecting attributes refs #3847
Change-Id: I7cba6e26ad98e91723e2ccf0a28b8db79bb37b5c
Reviewed-on: https://gerrit.instructure.com/3631
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-25 17:38:50 -06:00
Brian Palmer 432a7fd6b3 send web conference invitiation notifications, refs #4513
Change-Id: I58740b718afd194db3da18faded9fcc9642c082d
Reviewed-on: https://gerrit.instructure.com/3731
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-20 12:48:09 -06:00
Jon Jensen 48346a56cc basic wimba archiving support, closes #4263
added generic user_setting fu to conference classes so we can expose
conference-type-specific settings in the canvas ui

Change-Id: I37a30ad3643d358be1458f59da488f34f680bb8b
Reviewed-on: https://gerrit.instructure.com/3140
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-23 10:56:35 -06:00
Zach Wily df3d4c6351 use something more secure than UUID for our unique tokens; fixes #4264
Change-Id: I407b50b98e44eab4e341b596ebefe9f35af3dc37
Reviewed-on: https://gerrit.instructure.com/3097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-15 10:54:47 -06:00
Jon Jensen ce0040958e BigBlueButton integration, refs #3319
Change-Id: Iaa38c753592f1b39d272487b3c0f231646168014
Reviewed-on: https://gerrit.instructure.com/2962
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-06 16:15:30 -06:00
Brian Whitmer ddf37a8b35 web conference configs not getting correct domain
Change-Id: Ice5ef8599211f18ae68b8869d29381a91008a826
Reviewed-on: https://gerrit.instructure.com/2707
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-19 08:16:29 -06:00
Brian Whitmer dadd68f5be web conferences not getting correct config
Change-Id: I1c65811b2056a92c92ea77439115e8e34062c0e9
Reviewed-on: https://gerrit.instructure.com/2705
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-19 07:54:43 -06:00
Jon Jensen 86b062bf61 wimba integration, fixes #2989
added wimba web conferencing support, moved dimdim config into plugin
settings, fixed a few web conferencing ui issues

Change-Id: I6b36b0e594a9f296d14cd35bec02186478bcbd13
Reviewed-on: https://gerrit.instructure.com/2343
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:35:14 -07:00
Brian Whitmer ee56f631b9 revising conferences open/closed logic
this logic didn't make sense to me, and it was obviously
broken, so I rewrote it.  These are the new assumptions
for web conferences:

- when the first participant joins a conference, we set
  started_at, start_at and end_at
- once nobody is using the conference anymore and end_at
  has passed, or it is more than 15 minutes past
  end_at, we set ended_at
- if ended_at is set and has passed, the conference is
  considered closed
- if ended_at is not set and a user tries to join an
  inactive conference, don't let them unless they're
  authorized to resume the conference
- conferences are resumable by those with permission, but
  only until the end_at date, after that it's all over

fixes #3827

Change-Id: I3f7474c314a99f0fd5a2b7f9222216d2fc3168a1
Reviewed-on: https://gerrit.instructure.com/2304
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-16 10:54:47 -07:00
Brian Whitmer d16e161a4e students couldn't initiate conferences, even if authorized
fixes #3797

Change-Id: I8efe888865815b4ef02e9bc30c03b7469102606e
Reviewed-on: https://gerrit.instructure.com/2271
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-15 14:33:54 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00