Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,864 Commits 1 Branch 0 Tags
4e65b1f14b70c7cf5daa07a8a36d83fbbcb8f9fc
Commit Graph

7886 Commits

Author SHA1 Message Date
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -04:00
Nimisha Asthagiri
eb02f2adc1 LMS Update to hide subsection content based on due-date 
TNL-4905
 2016-07-19 21:13:14 -04:00
alisan617
95b2bfbbee Remove edx-icons usage in studio - TNL-4815 
Remove edx-icons from edx-platform - TNL-4813
Remove edx-icons from LMS - TNL-4952
comment out baseline screenshot Bokchoy assertion tests
SOL-1937 Temporarily comment out baseline screenshot Bokchoy assertion tests
 2016-07-13 19:43:59 -04:00
John Eskew
4fca1d9d98 Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields 
Update version of XBlock repo.
 2016-07-11 13:29:51 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346 
[PERF-346] Add a second version component to versioned course asset URLs
 2016-07-11 09:32:09 -04:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs 
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
 2016-07-10 19:20:20 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks 
Move disabling of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:17 -04:00
John Eskew
1131edc9a2 Change test to reflect how XBlock handles control chars. 2016-07-08 14:04:00 -04:00
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of / 
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
 2016-07-08 11:44:09 -04:00
Adam Palay
a19d2e76ff quiet some noisy logs 2016-07-06 16:32:27 -04:00
cahrens
8980d1ab2d Switch disabling of XBlocks to XBlockConfiguration. 
Also allows dynamic updates.
TNL-4668
 2016-07-06 11:04:53 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Hamza Munir
3ad2f09233 tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation. 2016-06-30 14:34:31 +05:00
alisan617
68587ade39 remove icon-fallback-img spans and safe commit templating 2016-06-29 15:12:33 -04:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Chris Rodriguez
0d7bf1b78e Removing safe transcripts for now 2016-06-28 06:05:40 -04:00
Chris Rodriguez
fba37a129d AC-454 adding visual clarify for selected menu options 2016-06-28 06:05:40 -04:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Nimisha Asthagiri
1798b1f1bc Merge pull request #12567 from edx/tnl/grading 
Grading uses Block Transformers
 2016-06-24 09:01:30 -04:00
Nimisha Asthagiri
7fe002ff82 Improve error handling in Split Modulestore 2016-06-24 00:46:01 -04:00
Nimisha Asthagiri
8513e823bc Add block_metadata_utils 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
57dde6516a Update ENABLED_CACHES values 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
fb120426e0 Fix Typos 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
02e6925275 Update grades to use Block Structures 2016-06-23 20:22:31 -04:00
Eric Fischer
d3128f4d36 Masquerading staff override hidden special exams [TNL-4808] (#12806) 
Allows staff using "view as specific student" mode to bypass edx-proctoring
hiding special exams from students, to allow for more useful debugging.

Includes "shim" pattern library implementation of alerts, and a bokchoy
test for this functionality.
 2016-06-23 16:54:57 -04:00
Adam Palay
07f5bacce2 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 55d84d34b8.
 2016-06-23 14:13:48 -04:00
Toby Lawrence
4795067ab1 Cautiously grab the content digest. 2016-06-23 13:42:00 -04:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."" 
This reverts commit 9967b6fd58.
 2016-06-23 13:27:15 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat 
AC-454 visual indicator in video menus + safe transcripts
 2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -04:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export 
Fix course export on edge
 2016-06-13 18:46:56 +05:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04:00
clrux
4a53f78129 Merge pull request #12676 from edx/clrux/ac-473 
AC-473 fixing width of closed captions in fullscreen
 2016-06-10 06:32:21 -04:00
Awais Jibran
ba6ef624c2 PLAT-1032 2016-06-10 11:38:20 +05:00
Calen Pennington
a173270ef1 Fix pylint-identified issues in i18n_tests 2016-06-09 16:26:21 -04:00
Calen Pennington
e7caf9b0ca Rename i18n.tests to i18n_tests, so that the i18n.tests package can be a package without squashing the python i18n package namespace 2016-06-09 15:25:37 -04:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
muhammad-ammar
8024bae255 enforce display name in CAPA problems 
FEDX-198
 2016-06-09 16:42:19 +05:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
Chris Rodriguez
c1942467bf AC-473 fixing width of closed captions in fullscreen 2016-06-06 15:03:34 -04:00
Jerzy Kozera
d7ca5d94d9 Fix for thumbnail generation code crashing with SVG files 
Fixes TNL-3960: adding an SVG file to assets resulted in a logged
exception while generating a thumbnail. A user-visible side effect
was that no thumbnail was shown next to the uploaded file, which
is working correctly now after this change.
 2016-06-03 21:26:29 +02:00
Syed Hasan raza
f31e370f46 Merge pull request #12607 from edx/shr/bug/PLAT-1040-video-module-non-ASCII-values-fixed 
Fixed logging and unicode handling
 2016-06-03 17:05:19 +05:00
Syed Hassan Raza
745e481597 Fixed logging and unicode handling 2016-06-03 15:36:41 +05:00
Chris Rodriguez
f64bf4c081 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 4175616519.
 2016-05-31 10:43:44 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
clrux
0bcb378a6d Merge pull request #12419 from edx/clrux/ac-454 
AC-454 adding visual clarity for selected menu options in the video player
 2016-05-26 06:04:09 -04:00