Skip to content

Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516) #2592

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.

Sign up for GitHub

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

Closed
cpennington wants to merge 2 commits into from
Closed

Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516) #2592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e2bc0
Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516)
cpennington Feb 13, 2014
c3b4432
Add trailing commas to multiline lists, to prevent string concatenati…
cpennington Feb 13, 2014
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
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/views/transcripts_ajax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
'choose_transcripts',
'replace_transcripts',
'rename_transcripts',
'save_transcripts'
'save_transcripts',
]

log = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
LMS_ROOT / "static",

# This is how you would use the textbook images locally
# ("book", ENV_ROOT / "book_images")
# ("book", ENV_ROOT / "book_images"),
]

# Locale/Internationalization
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/track/backends/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'agent',
'page',
'time',
'host'
'host',
]


Expand Down
2 changes: 1 addition & 1 deletion common/lib/capa/capa/capa_problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"script",
"hintgroup",
"openendedparam",
"openendedrubric"
"openendedrubric".

@adampalay adampalay Feb 13, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

period!

]

log = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion common/test/acceptance/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Silence noisy loggers
LOG_OVERRIDES = [
('requests.packages.urllib3.connectionpool', logging.ERROR),
('django.db.backends', logging.ERROR)
('django.db.backends', logging.ERROR),
]

for log_name, log_level in LOG_OVERRIDES:
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/courseware/features/video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
HTML5_SOURCES = [
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp4',
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.webm',
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv'
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv',
]
HTML5_SOURCES_INCORRECT = [
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp99'
'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp99',
]

coursenum = 'test_course'
Expand Down
4 changes: 2 additions & 2 deletions lms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,8 @@
'js/vendor/ova/jquery-Watch.js',
'js/vendor/ova/ova.js',
'js/vendor/ova/catch/js/catch.js',
'js/vendor/ova/catch/js/handlebars-1.1.2.js'
'js/vendor/URI.min.js'
'js/vendor/ova/catch/js/handlebars-1.1.2.js',
'js/vendor/URI.min.js',
]

discussion_js = sorted(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/discussion/**/*.js'))
Expand Down
2 changes: 1 addition & 1 deletion lms/envs/edx4edx_aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
("subs", DATA_DIR / "subs"),

# This is how you would use the textbook images locally
# ("book", ENV_ROOT / "book_images")
# ("book", ENV_ROOT / "book_images"),
]

MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT]