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

35738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
e18a44a0a5 Escape full name 
TNL-3849/SEC-69
 2016-03-21 11:02:15 -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
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
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
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
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
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