Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,801 Commits 1 Branch 0 Tags
2a87d6c8a54fc8b1d4dcc26f3384f4e0db9d7f0d
Commit Graph

13636 Commits

Author SHA1 Message Date
Toby Lawrence
2a87d6c8a5 Add straggler JS files to RequireJS overrides. 2016-03-24 11:35:48 -04:00
Toby Lawrence
e62a8da457 Set the correct names for overridden dependencies. 2016-03-23 11:28:25 -04:00
Toby Lawrence
f8ddfb5945 Use a module/path mapping for RequireJS overrides instead of just paths. 
Instead of attempting to derive the module portion of a RequireJS
override strictly from the path to the JS file, we now use a dictionary
where the module name must be explicitly specified.  This allows us to
compensate for files which do not follow a naming scheme that is
compatible with RequireJS without having to normalize all files.  This
is extremely important when using third-party dependencies.
 2016-03-23 10:34:58 -04:00
vkaracic
3c8ae7c3b2 Change EcommerceService's is_enabled to accept User instead of request 
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
 2016-03-23 07:44:55 +00:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform 
UITK-75
 2016-03-22 15:31:27 -04:00
Jesse Zoldak
a77000a89c Merge pull request #11881 from edx/zoldak/TE-1235 
Remove executable bit from test file  TE-1235
 2016-03-22 13:40:34 -04:00
Jesse Zoldak
7e79d335a6 Remove executable bit from test file TE-1235 2016-03-22 11:46:06 -04:00
Andy Armstrong
e854690a99 Revert "Upgrade underscore.string.min.js." 
This reverts commit e5c7fdda03.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
 2016-03-22 10:44:19 -04:00
Eric Fischer
e2c4131a5d Merge pull request #11797 from edx/christina/fix-improper-escaping 
Fix improper escaping.
 2016-03-22 08:49:20 -04:00
Awais Qureshi
4f5589e356 Merge pull request #11759 from edx/awais786/ECOM-2931-update-credit-eligible-email 
Add the providers information in the email.
 2016-03-22 16:03:14 +05:00
Awais
a154e7f1c3 Adding the ecom api functionality for the credentials. 
ECOM-2931
 2016-03-22 14:01:54 +05:00
cahrens
358ed2559a Fix improper escaping. 2016-03-21 16:01:04 -04:00
Christina Roberts
4626746678 Merge pull request #11844 from edx/christina/delete-carousel 
Delete face_upload and responsive-carousel.
 2016-03-21 13:26:04 -04:00
Eric Fischer
15205898ce Merge pull request #11862 from edx/efischer/master_replay 
Escape full names
 2016-03-21 12:19:36 -04:00
Renzo Lucioni
a5b10ca0fe Merge pull request #11805 from edx/renzo/self-paced-modulestore-wrapper 
Override field data within the XBlock runtime
 2016-03-21 12:14:22 -04:00
Ayub-khan
90a72ddba6 Properly escaping fullname 
To prevent XSS attacks, we now properly escape any string containing
the user's fullname. Enumerated by searching webview.py for "fullname",
and "git grep"-ing any occurrences. This also exposed some unused strings,
which I deleted for clarity.
 2016-03-21 11:07:00 -04:00
Robert Raposa
0a8f6fa3fe Properly escape the name 2016-03-21 11:06:56 -04:00
Robert Raposa
15ef27fe0f Escape full name 
TNL-3849/SEC-69
 2016-03-21 11:06:52 -04:00
Peter Pinch
7eb079df3e Merge pull request #11712 from mitocw/enhancement/aq/prevent_ccx_creation_if_CCXConnector_is_set_mitocw#189 
Prevented creation of new CCX in lms, when a CCXConnector URL is set on a course
 2016-03-21 08:52:51 -04:00
Aamir
91f59d59cb Merge pull request #11780 from edx/aamir-khan/ECOM-3345-remove-gen-cert-button 
Remove the certificate generation button from progress page for audit student
 2016-03-21 17:09:10 +05:00
sanfordstudent
a86734fe70 Merge pull request #11851 from edx/sstudent/MA-2164-cleanup 
MA-2164 cleaning up old lettuce
 2016-03-21 07:49:26 -04:00
aamir-khan
6fe0638214 Remove the certificate generation button from progress page for audit student 2016-03-21 15:52:54 +05:00
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime 
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
 2016-03-18 17:15:00 -04:00
Andy Armstrong
76b8e2e897 Merge pull request #11631 from edx/fedx/upgrade-libraries 
Upgrade Underscore.js and Underscore.string.js
 2016-03-18 16:32:16 -04:00
Sanford Student
da828cdf75 MA-2164 cleaning up old lettuce 2016-03-18 14:42:23 -04:00
sanfordstudent
658348da68 Merge pull request #11816 from edx/sstudent/MA-2164 
MA-2164 adding youtube url to encoded videos
 2016-03-18 06:41:04 -04:00
Muddasser
1cef58271b Merge pull request #11829 from edx/muddasser/lms/data_download 
Partially covered in bokchoy at lms/test_lms_instructor_dashboard.py:DataDownloadsTest
 2016-03-18 12:18:58 +05:00
raeeschachar
8343bd4e3e Merge pull request #11791 from edx/raees/testing-one-feature-file 
Testing feature file
 2016-03-18 10:55:12 +05:00
cahrens
e5c7fdda03 Upgrade underscore.string.min.js. 
FED-68
 2016-03-17 23:33:55 -04:00
Adam
ec57ee027d Merge pull request #11848 from edx/release 
Release
 2016-03-17 22:58:10 -04:00
Sanford Student
3893f3f069 MA-2164 add youtube when mobile video encoding missing 2016-03-17 19:59:33 -04:00
Clinton Blackburn
6ad750a1f3 Fixed accessibility issues with password reset 
ECOM-3938
 2016-03-17 16:40:42 -04:00
Ned Batchelder
2536c58920 Merge pull request #11835 from edx/ned/updated-translations 
Update translations (autogenerated message)
 2016-03-17 15:46:41 -04:00
cahrens
f9901614f1 Delete face_upload and responsive-carousel. 
This appears to be dead code.
 2016-03-17 15:14:19 -04:00
David Ormsbee
b8b7327e93 Revert "Make Capa problems do initial load without AJAX." 
This reverts commit 9984bbc29a.
 2016-03-17 14:26:04 -04:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests. 
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
 2016-03-17 12:01:42 -04:00
raeeschachar
792bca88a3 Removed annotatable.feature and events.feature and related py files 2016-03-17 18:34:18 +05:00
Ned Batchelder
6883f21542 Update translations (autogenerated message) 2016-03-17 10:54:37 +00:00
Muddasser
79c5a792e8 Removed duplicate lettuce test from data_download.feature 2016-03-17 14:39:40 +05:00
Toby Lawrence
9b8ff773ee Merge pull request #11824 from edx/release 
Merge release back to master.
 2016-03-16 21:11:37 -04:00
cahrens
a1f73f7ba8 Simplify how underscore.string is referred to. 2016-03-16 17:09:26 -04:00
cahrens
dd2a203677 Upgrade underscore to newest version. 
FEDX-24
 2016-03-16 17:08:27 -04:00
Andy Armstrong
7ead068a4e Merge pull request #11813 from edx/andya/upgrade-requirejs 
Upgrade RequireJS
 2016-03-16 14:24:27 -04:00
Jesse Zoldak
f01f36a541 Merge pull request #11822 from edx/zoldak/revert-pr11613 
Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
 2016-03-16 13:23:42 -04:00
Peter Fogg
954504d72c Merge pull request #11786 from edx/peter-fogg/course-home-a11y 
Accessibility fixes for the course home page.
 2016-03-16 12:45:17 -04:00
Andy Armstrong
06daf79b94 Upgrade RequireJS 
FEDX-105
 2016-03-16 12:42:00 -04:00
Diana Huang
9242d97bd9 Merge pull request #11817 from edx/diana/hide-video-error 
Use is-hidden instead of hidden for video errors.
 2016-03-16 11:31:38 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit 954dae584a.
 2016-03-16 11:19:36 -04:00
Toby Lawrence
a32ee429a3 Revert "Fixed the other half of forgot password flow accourding to logistration." 
This reverts commit 178f5a6056.
 2016-03-16 11:19:01 -04:00
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00