Skip to content

Commit

Permalink
Merge branch 'dev-1.5' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
#	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java
#	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java
#	src/test/java/ch/ethz/seb/sebserver/gbl/util/UtilsTest.java
  • Loading branch information
anhefti committed Jan 25, 2024
2 parents 6d47e8f + ef3c915 commit 6e6022d
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 2 deletions.
35 changes: 35 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"
# You can also specify other tool versions:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"
# Fail on all warnings to avoid broken references
# fail_on_warning: true

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: docs/requirements.txt
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'sphinx.ext.todo',
'sphinx.ext.imgmath',
'sphinx.ext.viewcode',
'sphinx.ext.githubpages',
'sphinx.ext.githubpages'
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
8 changes: 8 additions & 0 deletions docs/exam_proctoring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
Optional Live Proctoring
========================

.. attention::

Deprecation

The SEB Server live proctoring integration with Zoom and Jitsi Meet will be deprecated within the next upcoming version of SEB Server 1.6.

This means live proctoring is still available for dedicated SEB versions, but not actively maintained and supported any more.

Live proctoring is a new and yet experimental feature of SEB and SEB Server. The feature is fully optional and not enabled by default.
The main goal of the live proctoring feature is to support the integration
of an external meeting service like Jitsi Meet or Zoom for example, within a SEB and SEB Server setup for an exam.
Expand Down
8 changes: 8 additions & 0 deletions docs/monitoring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ In the detail view you are also able to use the instructions "Quit SEB Client" a
Optional Live Proctoring
------------------------

.. attention::

Deprecation

The SEB Server live proctoring integration with Zoom and Jitsi Meet will be deprecated within the next upcoming version of SEB Server 1.6.

This means live proctoring is still available for dedicated SEB versions, but not actively maintained and supported any more.

Live proctoring is a new and yet experimental feature of SEB and SEB Server. The feature is fully optional and not enabled by default.
This section is about the live proctoring on monitoring a running exam and using the optional live proctoring within.
To configure the optional live proctoring for a specific exam please have a look at `Optional Live Proctoring <https://seb-server.readthedocs.io/en/latest/exam_proctoring.html#sebProctoringSettings>`_
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
docutils<0.18
sphinx==5.3.0
sphinx_rtd_theme==1.1.1
sphinx_rtd_theme==2.0.0
readthedocs-sphinx-search==0.1.1
urllib3==1.26.13

0 comments on commit 6e6022d

Please sign in to comment.