Commit Graph

7039 Commits

Author SHA1 Message Date
George Song
487895fb21 Merge pull request #14862 from replaceafill/default_discussion_topic
Default discussion topic
2017-07-06 05:25:43 -07:00
muhammad-ammar
626f2896a0 add video poster support
EDUCATOR-44
2017-07-06 12:35:05 +05:00
Muhammad Ammar
dca12d65c2 Save or update course video image - TNL-6762 2017-07-06 12:35:00 +05:00
Douglas Cerna
eacc4bc138 Allow to set the default topic for new Discussion posts 2017-07-05 20:26:32 -06:00
Jeremy Bowman
e4c8ff3aa4 Merge pull request #15445 from edx/jmbowman/PLAT-1499
PLAT-1499 Use appropriate default settings in Docker devstack
2017-07-05 13:22:14 -04:00
Qubad786
acfa80a663 Override video's youtube_id_1_0 with val yt id on save. 2017-07-05 14:58:13 +05:00
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -04:00
Robert Raposa
a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter
Rename xss linter.
2017-06-30 16:22:38 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Jeff LaJoie
a45ac2f45d Merge pull request #15437 from edx/jlajoie/EDUCATOR-793
EDUCATOR-793: converts TypeError,NotFoundError logging to debug only
2017-06-29 16:12:08 -04:00
Jeff LaJoie
5160909d3b EDUCATOR-793: converts TypeError,NotFoundError logging to debug only 2017-06-29 15:17:45 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag.
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
2017-06-29 11:04:35 -04:00
Muhammad Ammar
4622b24ab4 Merge pull request #15385 from edx/ammar/fix-video-flaky-test
fix video flaky test
2017-06-23 17:10:15 +05:00
muhammad-ammar
4d609f80ea fix video flaky test
EDUCATOR-607
2017-06-23 15:57:27 +05:00
Alex Dusenbery
fb36c7df6c EDUCATOR-514 | Add certificate_available_date field to CourseFields 2017-06-21 11:57:38 -04:00
Peter Pinch
b9e768410f return only error value to students when codejail raises an exception
remove comment for translators

inst.args[0] is more reliable than inst.message

consistent escaping
2017-06-13 21:17:00 -04:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344
Bbaker/educator 344
2017-06-13 10:42:35 -04:00
Brandon Baker
6b62bf9b4b EDUCATOR-344
Removed extraneous instances of track_function
2017-06-12 14:45:37 +00:00
Brandon Baker
f4c9044d2e EDUCATOR-344
Removed instances of track function
2017-06-09 18:51:10 +00:00
Muhammad Ammar
e748652840 Merge pull request #15199 from edx/ammar/edu-211-html5-player-overlay-play-button
show play button overlay
2017-06-08 11:46:41 +05:00
Albert (AJ) St. Aubin
27b0dc9fd1 Merge pull request #15037 from edx/christina/ed11-simplification
Feature branch: dividing discussions by enrollment tracks
2017-06-07 13:22:13 -04:00
muhammad-ammar
e89c08d84d show play button overley
EDUCATOR-211
2017-06-07 17:04:37 +05:00
Andy Armstrong
3cffded2d1 Improve course breadcrumbs
LEARNER-877
2017-06-05 18:06:05 -04:00
cahrens
8951ac8c61 Refactor server-size code to enable enrollment tracks.
EDUCATOR-11
2017-06-05 12:59:50 -04:00
Brandon Baker
4536667ac8 Merge pull request #15234 from edx/bbaker/fix-text-wrapping-IE11
EDUCATOR-62 Fix question text wrapping in IE11
2017-06-02 15:37:51 -04:00
Brandon Baker
d2dc2a46c1 EDUCATOR-62 Fix question text wrapping in IE11 2017-06-02 12:36:54 +00:00
Harry Rein
6761a87bfb Fix for LEARNER-859: Updating styling on the course updates page to more clearly differentiate between multiple updates. Specifically:
- Updated styling on date in the top left corner
- Added horizontal line between updates
- Removed ability to toggle updates on and off
- Cleaned up code to always show all updates:
2017-06-01 16:43:09 -04:00
Jillian Vogel
6ca8a702ae Mask grades on progress page according to "Show Correctness" setting. 2017-05-31 16:57:38 +02:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance"
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
2017-05-30 12:42:54 -04:00
Qubad786
4c074f11cf Override video url with edx val encodings 2017-05-30 12:58:39 +05:00
John Eskew
e30e44cb9a Run isort on files touched in LicenseMixin move. 2017-05-25 16:24:57 -04:00
John Eskew
f1369b912e Move LicenseMixin and accompanying code to openedx/core/lib. 2017-05-25 16:17:31 -04:00
John Eskew
f97f052591 Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance
Move fields.py, inheritance.py, and partitions to openedx/core.
2017-05-25 14:21:03 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Adam Palay
3b803085db make translated string unicode (EDUCATOR-460) 2017-05-23 13:13:56 -04:00
Muzaffar yousaf
067e33e6a6 Merge pull request #14838 from OmarIthawi/omar/video-player-fullscreen-rtl
Fix RTL video player and subtitles misplacement in full screen
2017-05-15 16:55:59 +05:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page
LEARNER-879
2017-05-10 16:53:15 -04:00
Diana Huang
e12a704cea Add new course dates fragment.
Also add it to the course home page.
2017-05-04 20:53:42 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
Albert (AJ) St. Aubin
185bac1837 Merge pull request #15012 from edx/aj/EDUCATOR-60
Updated the message and style of the status notification when a user …
2017-05-03 13:29:03 -04:00
Albert St. Aubin
d9b8d51dab Updated the message and style of the status notification when a user enters text into numerical input 2017-05-03 11:50:40 -04:00
sanfordstudent
bcc3d16589 Merge pull request #14929 from edx/neem/capa-refactor
Refactor CAPA to use scorable XBlock mixin
2017-05-02 09:43:06 -04:00
Omar Al-Ithawi
ad4e3d50a5 Allow uploading subtitles with unicode filenames 2017-05-02 10:53:58 +03:00
J. Cliff Dyer
ea0027f338 refactor CAPA to use scorable xblock mixin
for TNL-6594
2017-05-01 15:08:17 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation
Remove a number of unneeded super()-delegation methods
2017-04-28 13:04:43 -04:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00