Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
508487bb6b Merge pull request #74 from edx/rc/2016-03-16 
Rc/2016-03-16
 2016-03-17 10:46:22 -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
cahrens
dd2a203677 Upgrade underscore to newest version. 
FEDX-24
 2016-03-16 17:08:27 -04:00
Ayub-khan
f0e7dcd346 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-16 15:18:21 -04:00
Robert Raposa
1961189819 Properly escape the name 2016-03-16 15:18:17 -04:00
Andy Armstrong
7ead068a4e Merge pull request #11813 from edx/andya/upgrade-requirejs 
Upgrade RequireJS
 2016-03-16 14:24:27 -04:00
Robert Raposa
8691393826 Escape full name 
TNL-3849/SEC-69
 2016-03-16 14:23:17 -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
Toby Lawrence
3d95bd542c Merge pull request #11793 from edx/rc/2016-03-16 
Release Candidate rc/2016-03-16
 2016-03-16 12:40:17 -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
Toby Lawrence
cac35ee2a1 Merge pull request #11823 from edx/releng/revert-ecom-2947 
Revert ECOM-2947.
 2016-03-16 11:25:07 -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
Omar Khan
2a5fce94c8 Update problem-builder to version 2.0.3 2016-03-16 07:23:28 +07:00
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00
Nimisha Asthagiri
b91f940af7 Merge pull request #11664 from mitocw/feature/gs/visible_to_staff_only 
Added visible_to_staff_only field to course blocks API
 2016-03-15 17:16:53 -04:00
George Schneeloch
6b8f372178 Added visible_to_staff_only field to course blocks API 2016-03-15 16:06:30 -04:00
Toby Lawrence
aba4e58836 Merge pull request #11814 from edx/clintonb/req-fix 
Reverted rfc6266 change
 2016-03-15 15:44:33 -04:00
Clinton Blackburn
ae0a128966 Reverted rfc6266 change 
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
 2016-03-15 15:37:21 -04:00
Toby Lawrence
e2b8df7ec6 Clear out usages of deprecated vendor prefixes. 2016-03-15 11:57:38 -04:00
M. Rehan
31cd7afc1c Merge pull request #11811 from edx/mrehan/tnl-4219-progress-detail-not-shown 
render progress status while problem content rendering
 2016-03-15 20:16:27 +05:00
Qubad786
167efea65c render progress status while problem content rendering 2016-03-15 19:53:30 +05:00
attiyaIshaque
a3caac1fcc Merge pull request #11789 from edx/atiya/ECOM-3613-certificates-email-address 
Email address with '+' is accepted by Student Support.
 2016-03-15 19:17:10 +05:00
Sven Marnach
d29dcc1697 Merge pull request #11803 from open-craft/smarnach/update-dndv2-version 
Bump the version of the Drag&Drop XBlock to 2.0.4.
 2016-03-15 14:14:53 +01:00
Amir Qayyum Khan
8a9e81fdda Added validation to ccx create form, If ccxcon url is set then app will ask user to create ccx from ccxcon app 2016-03-15 18:02:12 +05:00
Matt Drayer
a25caf31c3 Merge pull request #11613 from edx/ziafazal/WL-328 
Ziafazal/wl-328 multi-tenancy support in Comprehensive Theming
 2016-03-14 15:21:54 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming 
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
 2016-03-14 13:42:53 -04:00
Diana Huang
01ef2c9a45 Merge pull request #11776 from edx/efischer/tnl-4132 
Flaky Matlab Tests
 2016-03-14 13:42:04 -04:00
Eric Fischer
83e586d137 Merge pull request #11774 from edx/efischer/tnl-4151 
Flaky Discussion Tests
 2016-03-14 12:39:09 -04:00
Muzaffar yousaf
415c0ea6d0 Merge pull request #11802 from edx/mzfr/notes-bug 
Properly escape mixed content. text + html.
 2016-03-14 21:10:00 +05:00
Eric Fischer
41e1e27df5 Wait for element visibility instead of AJAX. 2016-03-14 11:19:37 -04:00
Sven Marnach
6d9598f325 Bump the version of the Drag&Drop XBlock to 2.0.4. 2016-03-14 16:07:57 +01:00
muzaffaryousaf
d43f33db31 Properly escape mixed content. text + html. 
TNL-4243
 2016-03-14 19:52:58 +05:00
Eric Fischer
c46e5c1cb0 Fix flaky discussion tests 
Ajax callbacks are used in a lot of places in discussions; our tests
need to wait for those callbacks to finish in several places.
 2016-03-14 10:27:15 -04:00
Ben Patterson
90c864d418 Merge pull request #11798 from edx/benp/sol-430-again 
Flagging other library import bok-choy test as flaky.
 2016-03-14 09:23:59 -04:00
Attiya Ishaque
751890b3da Email address with '+' is accepted by Student Support. 2016-03-14 18:11:19 +05:00
Robert Raposa
eb42cb1f38 Add safe template linter 
- Initial lint of Mako templates
- Initial lint of Underscore.js templates
 2016-03-12 21:12:06 -05:00
Ben Patterson
04cc6969ef Flagging other library import bok-choy test as flaky. 2016-03-12 12:48:13 -05:00
Nimisha Asthagiri
a1458b99f8 Merge pull request #11684 from CredoReference/feature/edx-23-new 
New optional parameters for course blocks API: lti_url, block_types_filter
 2016-03-11 17:09:41 -05:00
Ben Patterson
3a95597316 Merge pull request #11795 from edx/benp/te-1200 
Flag two tests as flaky. See inline comments for JIRA tickets.
 2016-03-11 14:17:23 -05:00