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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
44c7c927ed Merge pull request #11869 from edx/benp/bok-choy-race-condition 
Wait for numerical selection to load before continuing.
 2016-03-22 12:55:33 -04:00
Simon Chen
f2b7ca6f18 Merge pull request #11873 from edx/release 
Merge release 2016-03-22 back to master
 2016-03-22 12:12:56 -04:00
Andy Armstrong
4796d4f70a Merge pull request #11876 from edx/andya/revert-underscore-string-upgrade 
Revert "Upgrade underscore.string.min.js."
 2016-03-22 11:55:34 -04:00
Adam
6fc8da2769 Merge pull request #11875 from edx/adam/fix-typo 
fix typo on testing.rst page
 2016-03-22 11:54:41 -04:00
Ben Patterson
c6a2afa037 Wait for numerical selection to load before continuing. 
TNL-4272
 2016-03-22 11:53:54 -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
Robert Raposa
f150fd9b3a Merge pull request #11800 from edx/robrap/safe-template-linter 
TNL-4214: Add safe template linter
 2016-03-22 10:40:29 -04:00
Adam Palay
82aad56e62 fix typo on testing.rst page 2016-03-22 10:25:01 -04:00
Eric Fischer
6bb06e5055 Update bok-choy requirement 2016-03-22 10:16:30 -04:00
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
Simon Chen
2be8191d5b Merge pull request #77 from edx/rc/2016-03-22 
Release Candidate rc/2016-03-22
 2016-03-22 08:53:42 -04:00
Simon Chen
8f8ed776a8 Merge pull request #11853 from edx/rc/2016-03-22 
Release Candidate rc/2016-03-22
 2016-03-22 08:52:55 -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
Muddasser
cfdaae9d36 Removed commented out and single textbook test scenario 2016-03-22 17:06:59 +05:00
Muddasser
6da296e454 Extract hint from html instead of text 2016-03-22 16:28:43 +05: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
Robert Raposa
52efa68b8b Change to output as you go 2016-03-21 22:51:15 -04:00
Robert Raposa
0538dea994 Fix review comments 
Changes include:
- Fix code review comments
- Add comments
- Rename variables and files
 2016-03-21 22:31:57 -04:00
Ben Patterson
66cf6ffb0a Fix flaky condition that's showing up in firefox 42. 2016-03-21 16:45:06 -04: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
Dmitry Viskov
8f1a4ccad3 Duplicate item in Studio should also duplicate related xblock aside 2016-03-21 22:20:06 +03:00
Usman Khalid
4feff96a98 Merge pull request #76 from edx/rsrct-preview-tnl4194 
Restrict preview mode for non-staff users.
 2016-03-21 22:43:55 +05: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
Simon Chen
82a246fbf4 Merge pull request #78 from edx/rsrct-preview-tnl4194 
Create the security fix #2 for the RC 2016-03-22
 2016-03-21 13:01:14 -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
Eric Fischer
6c6542aea5 Merge pull request #11861 from edx/efischer/escape_names 
Escape full names
 2016-03-21 11:55:46 -04:00
muzaffaryousaf
bb952e148f Restrice non-staff users to access preview content. 
TNL-4194
 2016-03-21 20:08:24 +05: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
Ayub-khan
ce2fded148 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:02:31 -04:00
Robert Raposa
a8c4b929e2 Properly escape the name 2016-03-21 11:02:22 -04:00
Robert Raposa
e18a44a0a5 Escape full name 
TNL-3849/SEC-69
 2016-03-21 11:02:15 -04:00
Douglas Hall
f2707bb480 Updated edx-proctoring requirement to 0.12.15 2016-03-21 10:22:15 -04:00
Attiya Ishaque
269a8e9d4d Styling on forums response vote button. 2016-03-21 18:33:06 +05: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
Dmitry Viskov
d750238410 Reduce the number of queries to mongodb in /courses/<course-id>/instructor/api/gradebook API 2016-03-20 03:42:31 +03: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