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

12686 Commits

Author SHA1 Message Date
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -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
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
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
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
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
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
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
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
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
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
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
David Ormsbee
c13e623067 Speed up SASS compilation with libsass 2016-01-29 12:30:55 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Hasnain
0971e3715a Added check for duplication of email 2016-01-29 14:01:07 +00:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages 
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
 2016-01-29 15:46:51 +05:00
Asad Iqbal
87d9a07931 Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang 
WL-243 LMS Language Selection
 2016-01-29 14:07:46 +05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Christine Lytwynec
092eae9ff3 Merge pull request #11130 from edx/clytwynec/ac-75 
AC-75 and AC-73
 2016-01-28 08:52:40 -05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization 
changes after feedback from matte
 2016-01-28 14:26:48 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service 
ECOM-3278
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Clinton Blackburn
0b8145ee75 Merge pull request #11357 from edx/clintonb/ccx-fix 
Resolved ccx-keys dependency on edx-opaque-keys
 2016-01-27 22:55:13 -05:00
Clinton Blackburn
29f0a5b172 Updated XModule opaque-keys dependency 
Using edx-opaque-keys instead of opaque-keys
 2016-01-27 17:19:39 -05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Ben Patterson
f43e19615b Merge pull request #11333 from edx/benp/mgmt-command-enroll-in-course 
Enroll already-existing user to a course via management command.
 2016-01-27 12:39:39 -05:00
Ben Patterson
551eaaf706 Enroll already-existing user to a course via management command. 
Our current sandbox provisioning uses a create_user management command,
which creates and enrolls a user into a course. However, for TE-1128, we
will need a way to enroll the same user to multiple courses (which are
dynamic at time of provisioning). Using the existing management
command is no longer feasible for that, so we are using one that accesses
the enrollment API, which is the new standard for new enrollment capabilities.
 2016-01-27 11:49:31 -05:00
Bill DeRusha
f59144b7e3 Merge pull request #11207 from edx/bderusha/yob-fix 
Update age calculation to be more conservative.
 2016-01-27 10:48:47 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251 
Add the basis of configuring a cache TTL for course assets.
 2016-01-27 08:38:16 -05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets. 
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
 2016-01-26 21:09:18 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Eric Fischer
7d773df52d Merge pull request #11171 from edx/andya/fix-discussion-more-icons 
Fix bug with discussion response "More..." actions
 2016-01-26 15:08:41 -05:00
Bill DeRusha
77668afa11 Update age calculation to be more conservative. 2016-01-26 13:19:51 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily 
It is unneeded here, and causes bad behavior.
 2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates 
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
 2016-01-26 13:08:42 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287 
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
 2016-01-25 22:27:25 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00