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

35765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
be00a96129 Get environment variable for bok-choy-custom runs 2016-03-22 10:16:30 -04:00
cahrens
0c9937889b Enabling XSS vulnerability flag for bok choy tests 2016-03-22 10:16:27 -04:00
Eric Fischer
b95dadcf29 Merge pull request #11874 from edx/efischer/mark_flaky 
Mark test as flaky TNL-4272
 2016-03-22 10:01:52 -04:00
Eric Fischer
9e71e3f311 Mark test as flaky TNL-4272 2016-03-22 09:56:37 -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
Ben Patterson
7c5a9da7fc Merge pull request #11855 from edx/benp/smarter-lms-sharding 
Builds: empty xunit file as a function.
 2016-03-21 15:32:59 -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
Ben Patterson
53c315a310 Builds: empty xunit file as a function. 
This also ensures that future lms shards are handled in a
smarter way, like our bok-choy shards. When no shard is
specified, rather than running all shards, only create
an empty xunit report.
 2016-03-19 12:57:54 -04: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
Toby Lawrence
f3d000ec18 Merge pull request #11812 from edx/PERF-276 
Clear out usages of deprecated vendor prefixes.
 2016-03-18 08:02:45 -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
Muddasser
c9f8682a27 Merge pull request #11832 from edx/muddasser/lettuce/cms/course_export 
Covered in bokchoy at studio/test_import_export.py:TestCourseBadExport
 2016-03-18 12:18:30 +05:00
Muddasser
ba4e9ee3a9 Merge pull request #11833 from edx/muddasser/lettuce/cms/courses 
Partially covered in bokchoy at studio/test_studio_course_create.py:CreateCourseTest
 2016-03-18 12:18:18 +05:00
Muddasser
f3a0c58a23 Merge pull request #11836 from edx/muddasser/lettuce/cms/component.feature 
Partially covered in bokchoy at studio/test_studio_container.py:EditContainerTest and studio/test_studio_container.py:DisplayNameTest
 2016-03-18 12:18:03 +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
Adam
6860366d11 Merge pull request #11842 from edx/hotfix/2016-03-17 
Revert "Make Capa problems do initial load without AJAX."
 2016-03-17 17:18:00 -04:00
Clinton Blackburn
ebefd0d210 Merge pull request #11843 from edx/clintonb/login-a11y 
Fixed accessibility issues with password reset
 2016-03-17 16:41:05 -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
4660055e07 Merge pull request #11411 from edx/benp/shard2-lms 
Create a third shard for lms unit tests.
 2016-03-17 13:23:30 -04:00
Braden MacDonald
8aff51bfac Merge pull request #11818 from open-craft/omar/problem-builder 
Update problem-builder to version 2.0.3
 2016-03-17 10:12:55 -07: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
Muddasser
cb0bb1f40f Removed duplicate lettuce test from component.feature 2016-03-17 16:37:32 +05:00
Ned Batchelder
6883f21542 Update translations (autogenerated message) 2016-03-17 10:54:37 +00:00
Muddasser
832381146e Removed duplicate luttuce test from courses.feature 2016-03-17 15:48:49 +05:00
Muddasser
079742d695 Removed duplicate lettuce test from course-export.feature 2016-03-17 15:27:14 +05: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