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

35669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -05:00
Afzal Wali
79dd597557 Bump edx-proctoring to 0.12.8 2016-02-03 10:47:56 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Omar Khan
5b84043428 Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting 
This feature check was commented out in 8ee9a967 more than 2 years ago,
we might as well remove the setting.
 2016-02-03 21:20:23 +07:00
Diana Huang
69e3267941 Merge pull request #11408 from edx/diana/exclude-i18n-js 
Be specific about JS files for cms-squire.
 2016-02-03 09:15:08 -05:00
Ahsan Ulhaq
ddb2133fc9 Merge pull request #11405 from edx/ahsan/ECOM-3604-Add-xseries-certificates-in-edx-theme 
Add xseries certificates sidebar section in edx.org theme
 2016-02-03 16:10:49 +05:00
Florian Haas
e1ce4059e1 Update AUTHORS 
As required by CONTRIBUTING.rst.
 2016-02-03 09:37:27 +01:00
Florian Haas
fef6f64a7b lms: Only show welcome video if show_homepage_promo_video is set 
While show_homepage_promo_video would previously toggle the control to
play the welcome video on and off, the YouTube embed iframe would be
included in index.html unconditionally. This created the ugly
situation that YouTube would try to pull in a non-existent video, and
that a DoubleClick tracking beacon would be introduced to the start
page for no reason.

Instead, make sure show_homepage_promo_video toggles the entire modal
video section on and off, suppressing it altogether unless
show_homepage_promo_video is set.
 2016-02-03 09:37:27 +01:00
Zia Fazal
23b24d503e Merge pull request #11404 from edx/ziafazal/WL-305 
ziafazal/WL-305: removed constraints on MicrositeHistory model to allow Updates on Microsite
 2016-02-03 11:17:35 +05:00
Diana Huang
f00841d38e Be specific about JS files for cms-squire. 2016-02-02 17:16:31 -05:00
Peter Fogg
cd9b39ec48 Merge pull request #11409 from edx/peter-fogg/partner-email-setting 
Convert PARTNER_SUPPORT_EMAIL to a setting.
 2016-02-02 16:49:43 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Peter Fogg
ce769b363d Convert PARTNER_SUPPORT_EMAIL to a setting. 2016-02-02 15:18:16 -05:00
Jesse Zoldak
4dffa32be2 Merge pull request #11383 from edx/rc/2016-02-02 
Release Candidate rc/2016-02-02
 2016-02-02 14:46:42 -05:00
sanfordstudent
b74e2d9e5b Merge pull request #11406 from edx/sstudent/add-to-auth 
adding sstudent to AUTHORS
 2016-02-02 14:44:52 -05:00
Kevin Falcone
19843f5a14 Bump requirements on two external apps that also use using() 2016-02-02 12:35:22 -05:00
Matjaz Gregoric
bb0c2901c7 Merge pull request #11319 from open-craft/remove-comprehensive-theme-finders 
Remove ThemingAware storage mixins and ComprehensiveThemeFinder
 2016-02-02 17:57:36 +01:00
Toby Lawrence
78370f3644 Merge pull request #11400 from edx/PERF-258 
Add the ability to exclude files from URL canonicalization.
 2016-02-02 11:28:05 -05:00
Calen Pennington
dffbc69a3c Merge pull request #11329 from cpennington/fix-cert-type-names 
Fix the help text for cert_name_short and cert_name_long
 2016-02-02 11:19:09 -05:00
Adam
979552512d Merge pull request #11380 from edx/fix-typo 
fix typo on certificate page
 2016-02-02 10:49:42 -05:00
Calen Pennington
1d60c40bd2 Merge pull request #11215 from CredoReference/xblock_aside_example 
XBlockAsides: little example of usage
 2016-02-02 10:45:20 -05:00
Ben Patterson
dcfb95e76b Merge pull request #11387 from edx/benp/fix-test-tooltip 
Correct flaky condition on tooltip.
 2016-02-02 10:44:53 -05:00
Toby Lawrence
e57d1a2006 Add leading period so we don't get partial matches on extensions. 2016-02-02 10:07:13 -05:00
Peter Desjardins
d6a76125c9 Merge pull request #11401 from edx/pdesjardins/PHX-248 
Edited wording of UI labels for configuring subsection prerequisites …
 2016-02-02 10:05:47 -05:00
Sanford Student
3120082c9f adding sstudent to AUTHORS 2016-02-02 10:00:39 -05:00
Zia Fazal
9aa6718b25 removed constraints on MicrositeHistory model to allow Updates on Microsite model 
fixed quality violations
 2016-02-02 19:01:09 +05:00
Ahsan Ulhaq
41f8c8f4dd Add xseries certificates sidebar section in edx.org theme 2016-02-02 17:12:30 +05:00
Ben Patterson
902126d55c Clarify method intent. Use BrokenPromise rather than assert. 2016-02-02 06:48:30 -05:00
Toby Lawrence
1183f6cec9 Add the ability to exclude files from URL canonicalization. 
To be able to more easily deal with same-origin issues, due to some course assets being loaded in an iframe, we're adding the ability to specify file extensions that should be excluded from URL canonicalization.  The default value is simply 'html', which means we won't rewrite asset links that point to files ending in .html.  Thus, they'll be loaded from the same origin as the parent page, and voila, no SOP issues.
 2016-02-01 21:44:35 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files 
Complete static i18n PR
 2016-02-01 17:13:43 -05:00
Calen Pennington
4191ea0013 Add a management command for cleaning up cert_name_short and cert_name_long 2016-02-01 17:02:14 -05:00
Calen Pennington
8acb93690f Fix the help text for cert_name_short and cert_name_long 
This resolves the textual issue in [ECOM-2907] (https://openedx.atlassian.net/browse/ECOM-2907).
There will also be a data fix.
 2016-02-01 17:02:14 -05:00
Kevin Falcone
2d9708da03 Remove uses of using() from migrations 
This hardcoded the db_alias fetched from schema_editor and forces django
to try and migrate any second database you use, rather than routing to
the default database.  In testing a build from scratch, these do not
appear needed.

Using using() prevents us from using multiple databases behind edxapp.

Additionally - add back a removed backwards migration from certificates
0003.  I have no idea why this was dropped in the 1.8 upgrade.
 2016-02-01 16:57:26 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Diana Huang
6723b89649 Merge pull request #10731 from doganov/TNL-3664-AUTHORS 
Add Kaloian Doganov to AUTHORS
 2016-02-01 15:43:08 -05:00
John Eskew
1e460e72b1 Upgrade Django from 1.8.7 to 1.8.9 2016-02-01 15:22:28 -05:00
cahrens
8f19128d83 Fix unit tests so they are testing aria-expanded. 2016-02-01 14:01:05 -05:00
Ned Batchelder
5a8b3d0256 Merge pull request #11392 from edx/ned/find-good-email-for-committer 
Automatically find a better email for a committer than x@users.noreply.github.com
 2016-02-01 10:48:15 -05:00
Douglas Hall
c325fc6326 Merge pull request #11384 from edx/douglashall/PHX-246/gating_multi_problem_prereq 
PHX-246 Multiple problems in a prerequisite sequence causes grading to fail
 2016-02-01 09:13:39 -05:00
Ned Batchelder
367a90bb95 Automatically find a better email for a committer than x@users.noreply.github.com 2016-02-01 07:39:00 -05:00
Douglas Hall
97cf6dd485 Merge pull request #11385 from edx/douglashall/fix_xmodule_import 
Remove gating api import from course xmodule
 2016-01-31 22:10:32 -05:00
Ben Patterson
07f8b8e9c3 Correct flaky condition on tooltip. 2016-01-30 16:56:12 -05:00
Douglas Hall
907d3e9f08 Merge pull request #11379 from edx/hasnain-naveed/HOL-44-extented 
HOL-44 / Added check for duplication of email
 2016-01-30 07:19:07 -05:00
Kaloian Doganov
fe3299227a Add self to AUTHORS 2016-01-30 13:43:18 +02:00
Ben Patterson
bea3663e3e Merge pull request #11317 from edx/benp/test-edit-raw-old 
[firefox upgrade] Wait for code mirror editor to be active
 2016-01-29 21:54:07 -05:00
Douglas Hall
263c71a6d7 Fix PHX-246 2016-01-29 20:45:07 -05:00
Ben Patterson
d7be722ce7 [firefox upgrade] Wait for code mirror editor to be active 
Not an issue for our tests on firefox 28; however, once we upgrade to
Firefox 42 (or later), a new wait condition is needed here. Otherwise,
the content is not set because selenium's action chain is starting too
early.
 2016-01-29 20:42:17 -05:00