Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #87

Merged
merged 46 commits into from
Aug 30, 2018
Merged

Dev #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c10ffc6
add celery integration
ptitloup Jul 19, 2018
8202a19
add celery in requirements, fix import in task and encode, pep8
ptitloup Jul 19, 2018
3a5263b
import celery app in main init
ptitloup Jul 20, 2018
f3bc644
defines the Celery instance in celery.py
ptitloup Jul 20, 2018
7b37fef
fix name of project
ptitloup Jul 20, 2018
886398a
fix name of celery app and work on celery config
ptitloup Jul 20, 2018
ee773b5
remove import django settings in celery
ptitloup Jul 20, 2018
c366617
fix pep8 and activate task to encode
ptitloup Jul 20, 2018
a38f4cd
fix use mp4 if playlist doesn't work
ptitloup Jul 20, 2018
67b51b5
add command to download video source
ptitloup Jul 20, 2018
343d42d
fix video_id in download video command
ptitloup Jul 20, 2018
1008633
add write information in video download command
ptitloup Jul 20, 2018
a8fc1b4
add last video in jumbotron on home page
ptitloup Aug 7, 2018
d860806
add minrate and maxrate in video rendition, use it in encode module, …
ptitloup Aug 7, 2018
6f8b07d
Merge pull request #85 from EsupPortail/ptitloup/change_rendition_enc…
Aug 7, 2018
9233716
fix bug in download command
ptitloup Aug 7, 2018
b4d24b1
improve show tab theme in navbar
ptitloup Aug 8, 2018
ee52c57
remove comments
ptitloup Aug 8, 2018
955be5f
add video count and total duration in footer
ptitloup Aug 8, 2018
02308e5
create video_caption_maker view, template and link it from completion
ptitloup Aug 8, 2018
41c6218
add copy to clipboard button
ptitloup Aug 9, 2018
f644e66
add some style and fix bug with start is 0
ptitloup Aug 9, 2018
99316e3
pep8
ptitloup Aug 9, 2018
cf9102d
Merge pull request #86 from EsupPortail/ptitloup/caption_maker
Aug 9, 2018
d540a85
improve encoding module to get better log, database info and send ema…
ptitloup Aug 9, 2018
31e198b
add chapter in import data
ptitloup Aug 10, 2018
f0f3148
improve import data and add completion contributor and document
ptitloup Aug 10, 2018
c294053
add import data for tracks, update webvtt, fix bug in template
ptitloup Aug 10, 2018
929454b
add import data for enrichment
ptitloup Aug 13, 2018
9bdb7ed
change the display of the video information
ptitloup Aug 13, 2018
ec20fe1
move video information into video-info.html, fix display in iframe
ptitloup Aug 13, 2018
185ef90
fix display in video and improve documentation
ptitloup Aug 14, 2018
4058aed
fix bug in context processors with timedelta
ptitloup Aug 14, 2018
4df9718
doc installation uwsgi/nginx
ptitloup Aug 14, 2018
269ca4a
Merge branch 'dev' of https://github.com/EsupPortail/podv2 into dev
ptitloup Aug 14, 2018
a35e200
Update installation.md
Aug 14, 2018
1517de3
fix default from email, improve documentation
ptitloup Aug 14, 2018
aefb42c
fix TEMPLATE_VISIBLE_SETTINGS, improve configuration documentation
ptitloup Aug 14, 2018
e4fc8b3
add try except doesnotexist for video in import data, fix bug with po…
ptitloup Aug 27, 2018
531b869
move overview vtt creating in create overview file if overview image …
ptitloup Aug 27, 2018
3712c49
add encoding in progress filter for video admin
ptitloup Aug 28, 2018
ae29740
pep8 and add link to go and to back to videocaptionmaker from completion
ptitloup Aug 29, 2018
4b9a04d
fix bug with enrichment by escape double quote for richtext
ptitloup Aug 29, 2018
6a86bdc
fix bug with video password
ptitloup Aug 30, 2018
3b2082a
correct default value for recorder files, add documentation to instal…
ptitloup Aug 30, 2018
6d3f0a9
end of documentation, remove autofocus in navbar, pep8 compliant
ptitloup Aug 30, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
220 changes: 220 additions & 0 deletions docs/configuration.md

Large diffs are not rendered by default.

306 changes: 262 additions & 44 deletions docs/installation.md

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions pod/authentication/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,19 @@
AFFILIATION = getattr(
settings, 'AFFILIATION',
(
('member', _('member')),
('student', _('student')),
('faculty', _('faculty')),
('staff', _('staff')),
('affiliate', _('affiliate')),
('employee', _('employee')),
('faculty', _('faculty'))
('member', _('member')),
('affiliate', _('affiliate')),
('alum', _('alum')),
('library-walk-in', _('library-walk-in')),
('researcher', _('researcher')),
('retired', _('retired')),
('emeritus', _('emeritus')),
('teacher', _('teacher')),
('registered-reader', _('registered-reader'))
)
)
SECRET_KEY = getattr(settings, 'SECRET_KEY', '')
Expand Down
Loading