Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
python-bigbluebutton2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
InfraBlue
python-bigbluebutton2
Commits
56f29854
"content/pages/git@edugit.org:Teckids/team-pr/teckids.org.git" did not exist on "fa7a6e2ffc815512a3d47578ba8c4b74387699e1"
Verified
Commit
56f29854
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 6-support-recordings
parents
97271cee
cab89722
No related branches found
No related tags found
1 merge request
!19
WIP: Resolve "Support recordings"
Pipeline
#2922
failed
4 years ago
Stage: test
Stage: build
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
bigbluebutton/django/apps.py
+1
-0
1 addition, 0 deletions
bigbluebutton/django/apps.py
bigbluebutton/django/models.py
+1
-1
1 addition, 1 deletion
bigbluebutton/django/models.py
poetry.lock
+11
-7
11 additions, 7 deletions
poetry.lock
pyproject.toml
+2
-2
2 additions, 2 deletions
pyproject.toml
with
15 additions
and
10 deletions
bigbluebutton/django/apps.py
+
1
−
0
View file @
56f29854
...
@@ -8,6 +8,7 @@ from . import settings, util
...
@@ -8,6 +8,7 @@ from . import settings, util
class
BigbluebuttonConfig
(
AppConfig
):
class
BigbluebuttonConfig
(
AppConfig
):
name
=
"
bigbluebutton.django
"
name
=
"
bigbluebutton.django
"
verbose_name
=
_
(
"
BigBlueButton Django integration
"
)
verbose_name
=
_
(
"
BigBlueButton Django integration
"
)
label
=
"
bigbluebutton
"
def
ready
(
self
):
def
ready
(
self
):
"""
Extend the User model with attribute shortcuts.
"""
"""
Extend the User model with attribute shortcuts.
"""
...
...
This diff is collapsed.
Click to expand it.
bigbluebutton/django/models.py
+
1
−
1
View file @
56f29854
...
@@ -203,7 +203,7 @@ class Meeting(models.Model):
...
@@ -203,7 +203,7 @@ class Meeting(models.Model):
(
"
join_as_moderator
"
,
_
(
"
Can join this meeting with moderator role
"
)),
(
"
join_as_moderator
"
,
_
(
"
Can join this meeting with moderator role
"
)),
(
"
grant_attendee
"
,
_
(
"
Can grant attendee privileges to others
"
)),
(
"
grant_attendee
"
,
_
(
"
Can grant attendee privileges to others
"
)),
(
"
grant_moderator
"
,
_
(
"
Can grant moderator privileges to others
"
)),
(
"
grant_moderator
"
,
_
(
"
Can grant moderator privileges to others
"
)),
(
"
add_urls
"
,
_
(
"
Can add new URLs for this meeting
"
))
)
,
(
"
add_urls
"
,
_
(
"
Can add new URLs for this meeting
"
)),
]
]
class
APIToken
(
models
.
Model
):
class
APIToken
(
models
.
Model
):
...
...
This diff is collapsed.
Click to expand it.
poetry.lock
+
11
−
7
View file @
56f29854
...
@@ -404,7 +404,7 @@ description = "A port of Ruby on Rails inflector to Python"
...
@@ -404,7 +404,7 @@ description = "A port of Ruby on Rails inflector to Python"
name
=
"inflection"
name
=
"inflection"
optional
=
false
optional
=
false
python-versions
=
">
=
3.5
"
python-versions
=
">
=
3.5
"
version
=
"0.
4
.0"
version
=
"0.
5
.0"
[[package]]
[[package]]
category
=
"dev"
category
=
"dev"
...
@@ -870,11 +870,14 @@ description = "Read the Docs theme for Sphinx"
...
@@ -870,11 +870,14 @@ description = "Read the Docs theme for Sphinx"
name
=
"sphinx-rtd-theme"
name
=
"sphinx-rtd-theme"
optional
=
false
optional
=
false
python-versions
=
"*"
python-versions
=
"*"
version
=
"0.
4.3
"
version
=
"0.
5.0
"
[package.dependencies]
[package.dependencies]
sphinx
=
"*"
sphinx
=
"*"
[package.extras]
dev
=
[
"transifex-client"
,
"sphinxcontrib-httpdomain"
,
"bump2version"
]
[[package]]
[[package]]
category
=
"dev"
category
=
"dev"
description
=
"sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"
description
=
"sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"
...
@@ -1097,7 +1100,7 @@ django = ["dicttoxml", "django"]
...
@@ -1097,7 +1100,7 @@ django = ["dicttoxml", "django"]
sysstat
=
[
"sadf"
]
sysstat
=
[
"sadf"
]
[metadata]
[metadata]
content-hash
=
"
8
ec
baaac1de0745c540d1264e7954bd7ead86ea66f1cec73d00f4bd6a9b81e79
"
content-hash
=
"
b
ec
a6d8e515ae0c467be57cc036201401148a8b4b85c84bbb09f5f39d3fbade0
"
python-versions
=
"^3.6"
python-versions
=
"^3.6"
[metadata.files]
[metadata.files]
...
@@ -1263,8 +1266,8 @@ importlib-metadata = [
...
@@ -1263,8 +1266,8 @@ importlib-metadata = [
{file
=
"importlib_metadata-1.6.1.tar.gz"
,
hash
=
"sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545"
}
,
{file
=
"importlib_metadata-1.6.1.tar.gz"
,
hash
=
"sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545"
}
,
]
]
inflection
=
[
inflection
=
[
{file
=
"inflection-0.
4
.0-py2.py3-none-any.whl"
,
hash
=
"sha256:
9a15d3598f01220e93f2207c432cfede50daff53137ce660fb8be838ef1ca6cc
"
}
,
{file
=
"inflection-0.
5
.0-py2.py3-none-any.whl"
,
hash
=
"sha256:
88b101b2668a1d81d6d72d4c2018e53bc6c7fc544c987849da1c7f77545c3bc9
"
}
,
{file
=
"inflection-0.
4
.0.tar.gz"
,
hash
=
"sha256:
32a5c3341d9583ec319548b9015b7fbdf8c429cbcb575d326c33ae3a0e90d52c
"
}
,
{file
=
"inflection-0.
5
.0.tar.gz"
,
hash
=
"sha256:
f576e85132d34f5bf7df5183c2c6f94cfb32e528f53065345cf71329ba0b8924
"
}
,
]
]
isort
=
[
isort
=
[
{file
=
"isort-4.3.21-py2.py3-none-any.whl"
,
hash
=
"sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"
}
,
{file
=
"isort-4.3.21-py2.py3-none-any.whl"
,
hash
=
"sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"
}
,
...
@@ -1484,6 +1487,7 @@ regex = [
...
@@ -1484,6 +1487,7 @@ regex = [
{file
=
"regex-2020.5.14.tar.gz"
,
hash
=
"sha256:ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"
}
,
{file
=
"regex-2020.5.14.tar.gz"
,
hash
=
"sha256:ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"
}
,
]
]
requests
=
[
requests
=
[
{file
=
"requests-2.23.0-py2.7.egg"
,
hash
=
"sha256:5d2d0ffbb515f39417009a46c14256291061ac01ba8f875b90cad137de83beb4"
}
,
{file
=
"requests-2.23.0-py2.py3-none-any.whl"
,
hash
=
"sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"
}
,
{file
=
"requests-2.23.0-py2.py3-none-any.whl"
,
hash
=
"sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"
}
,
{file
=
"requests-2.23.0.tar.gz"
,
hash
=
"sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
}
,
{file
=
"requests-2.23.0.tar.gz"
,
hash
=
"sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
}
,
]
]
...
@@ -1553,8 +1557,8 @@ sphinx-click = [
...
@@ -1553,8 +1557,8 @@ sphinx-click = [
{file
=
"sphinx_click-2.3.2-py2.py3-none-any.whl"
,
hash
=
"sha256:06952d5de6cbe2cb7d6dc656bc471652d2b484cf1e1b2d65edb7f4f2e867c7f6"
}
,
{file
=
"sphinx_click-2.3.2-py2.py3-none-any.whl"
,
hash
=
"sha256:06952d5de6cbe2cb7d6dc656bc471652d2b484cf1e1b2d65edb7f4f2e867c7f6"
}
,
]
]
sphinx-rtd-theme
=
[
sphinx-rtd-theme
=
[
{file
=
"sphinx_rtd_theme-0.
4.3
-py2.py3-none-any.whl"
,
hash
=
"sha256:
00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4
"
}
,
{file
=
"sphinx_rtd_theme-0.
5.0
-py2.py3-none-any.whl"
,
hash
=
"sha256:
373413d0f82425aaa28fb288009bf0d0964711d347763af2f1b65cafcb028c82
"
}
,
{file
=
"sphinx_rtd_theme-0.
4.3
.tar.gz"
,
hash
=
"sha256:
728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a
"
}
,
{file
=
"sphinx_rtd_theme-0.
5.0
.tar.gz"
,
hash
=
"sha256:
22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d
"
}
,
]
]
sphinxcontrib-applehelp
=
[
sphinxcontrib-applehelp
=
[
{file
=
"sphinxcontrib-applehelp-1.0.2.tar.gz"
,
hash
=
"sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"
}
,
{file
=
"sphinxcontrib-applehelp-1.0.2.tar.gz"
,
hash
=
"sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"
}
,
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
2
−
2
View file @
56f29854
...
@@ -30,7 +30,7 @@ classifiers = [
...
@@ -30,7 +30,7 @@ classifiers = [
[tool.poetry.dependencies]
[tool.poetry.dependencies]
python
=
"^3.6"
python
=
"^3.6"
xmltodict
=
"^0.12.0"
xmltodict
=
"^0.12.0"
inflection
=
"^0.
4
.0"
inflection
=
"^0.
5
.0"
click
=
{
version
=
"^7.1.1"
,
optional
=
true
}
click
=
{
version
=
"^7.1.1"
,
optional
=
true
}
toml
=
{
version
=
"^0.10.0"
,
optional
=
true
}
toml
=
{
version
=
"^0.10.0"
,
optional
=
true
}
tabulate
=
{
version
=
"^0.8.7"
,
optional
=
true
}
tabulate
=
{
version
=
"^0.8.7"
,
optional
=
true
}
...
@@ -61,7 +61,7 @@ safety = "^1.9.0"
...
@@ -61,7 +61,7 @@ safety = "^1.9.0"
sphinx
=
"^3.0.4"
sphinx
=
"^3.0.4"
sphinx-autodoc-typehints
=
"^1.10.3"
sphinx-autodoc-typehints
=
"^1.10.3"
pytest-django
=
"^3.9.0"
pytest-django
=
"^3.9.0"
sphinx_rtd_theme
=
"^0.
4.3
"
sphinx_rtd_theme
=
"^0.
5.0
"
sphinxcontrib-django
=
"^0.5.1"
sphinxcontrib-django
=
"^0.5.1"
sphinx-click
=
"^2.3.2"
sphinx-click
=
"^2.3.2"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment