Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,952 Commits 1 Branch 0 Tags
5c8f79c06729c1b7180dfd3fe1f8eff3838e3e4d
Commit Graph

11622 Commits

Author SHA1 Message Date
muhammad-ammar
69450fce47 create a new team 
TNL-1899
 2015-08-05 17:55:26 +05:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release 
Release merge to master
 2015-08-04 14:18:50 -04:00
Awais Jibran
6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints 
Fixed MathJax rendering in problem hint
 2015-08-04 23:12:03 +05:00
Awais Jibran
99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge 
Fixed ORA1 deprecated warning message
 2015-08-04 23:09:00 +05:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint 
Update pylint and astroid, reduces pylint count by 400
 2015-08-04 09:28:35 -04:00
Awais Jibran
1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name 
TNL-2855
 2015-08-04 18:18:18 +05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Jim Abramson
0e3be9de80 Merge pull request #9123 from edx/jsa/xcom-442 
Add historical course enrollment table.
 2015-08-03 17:06:24 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment 
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
 2015-08-03 13:18:41 -04:00
Marco Morales
25ff53539d Merge pull request #9168 from edx/marco/TNL-2946/capa/styling-fixes 
Capa Styling Fixes for Annotation Problems
 2015-08-03 11:50:05 -04:00
Will Daly
eaeb3256ab Merge pull request #9158 from edx/release 
Merging hotfix 2015-07-30 release back to master
 2015-08-03 08:42:28 -07:00
Marco Morales
90fcf4646a adds back in correct and incorrect styling for annotations problems 2015-08-03 10:57:31 -04:00
Andy Armstrong
d98354d05d Merge pull request #9133 from edx/andya/remove-mustache-from-discussions 
Remove Mustache usage from discussions
 2015-08-01 20:48:50 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX 
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
 2015-08-01 02:59:10 -05:00
Andy Armstrong
96e14e3f8b Fix forums escaping bug 
TNL-2919
 2015-07-31 19:40:04 -04:00
aamir-khan
f286152f5a ECOM-1947: updated the middleware to exclude the password strings from event logging 2015-07-31 15:51:42 -04:00
Christina Roberts
b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions 
Christina/team discussion permissions
 2015-07-31 12:32:30 -04:00
Sarina Canelake
848e72c770 Merge pull request #9134 from edx/sarina/allow-logistration-in-microsites 
Allow microsites to use logistration page (ECOM-1976)
 2015-07-31 10:26:19 -04:00
Marco Morales
10a0bc6f1d Merge pull request #9122 from jolyonb/questionfix 
CAPA CSS: Fixing indicator spacing on dropdown problems
 2015-07-31 09:52:02 -04:00
David Baumgold
2afc586a91 Merge pull request #8934 from edx/db/fix-python-saml-compile-issue 
Re-upgrade to setuptools
 2015-07-31 09:43:23 -04:00
Sarina Canelake
db2d8f6594 Allow microsites to use logistration page (ECOM-1976) 2015-07-31 09:33:59 -04:00
Renzo Lucioni
50f920be3c Merge pull request #9135 from edx/renzo/always-allow-unenrollment 
Allow enrollments in expired modes to be deactivated
 2015-07-31 09:23:34 -04:00
Diana Huang
c12c2933a7 Make context for threads more implicit. 2015-07-31 08:58:01 -04:00
Braden MacDonald
659db2eb7d Merge pull request #9125 from open-craft/sso-metadata-email-config 
SSO: Make email addresses in SAML metadata fully configurable
 2015-07-30 13:59:49 -07:00
David Baumgold
ebe8b25210 Upgrade setuptools to 18.0.1 
This reverts commit 1a3f0958b9.
 2015-07-30 16:22:42 -04:00
aamir-khan
a59be0f7f4 ECOM-1947: updated the middleware to exclude the password strings from event logging 2015-07-30 11:52:07 -07:00
Renzo Lucioni
4131aa4d38 Allow enrollments in expired modes to be deactivated 
Facilitates revocation of enrollments in expired modes. XCOM-490.
 2015-07-30 12:39:25 -04:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard 
ECOM-1917
 2015-07-30 14:33:40 +05:00
Braden MacDonald
f776b81853 Make email addresses in SAML metadata fully configurable 2015-07-29 14:48:31 -07:00
jsa
810d623325 Add historical course enrollment table. 
XCOM-442
 2015-07-29 17:35:41 -04:00
Jolyon Bloomfield
d06abbf01e Fixing indicator spacing 2015-07-29 17:10:08 -04:00
Mushtaq Ali
40f8947334 Merge pull request #9100 from edx/mushtaq/tnl2593-fix-publish-automatically-after-deleting-unit 
Autopublish when vertical is deleted
 2015-07-29 23:02:54 +05:00
Mushtaq Ali
6964690097 Merge pull request #9096 from edx/mushtaq/tnl-2609-fix-url-link-issue-markdown-editor 
Fix markdown editor reference link having colon issue
 2015-07-29 22:05:46 +05:00
frances botsford
f8d1776698 Merge pull request #8972 from jolyonb/jolyonb/discussion 
Small printing fixes (LMS)
 2015-07-29 10:10:47 -04:00
frances botsford
cfe3acb7c4 Merge pull request #7594 from jolyonb/jolyonb/p-spacing 
Fixing paragraph spacing with inline class (capa)
 2015-07-29 10:06:28 -04:00
David Baumgold
7a32fbc941 Merge pull request #9104 from edx/improve-learner-profile-tests 
Minor improvements to learner profile tests
 2015-07-29 09:05:21 -04:00
mushtaqali
edad392a26 Autopublish when vertical is deleted 2015-07-29 11:44:11 +05:00
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates 
Pull discussion underscore templates out into individual files
 2015-07-28 22:33:34 -04:00
Braden MacDonald
9e00e2b397 Allow previewing cohorted content when masquerading 2015-07-28 17:17:34 -04:00
jsa
849ad8df94 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-28 17:17:13 -04:00
Chris Dodge
81502176e1 Integrate timed and proctored exam authoring into Studio 2015-07-28 17:16:06 -04:00
David Baumgold
263bcaf2fc Simplify birth_year variable 2015-07-28 16:47:03 -04:00
David Baumgold
5500603742 assertTrue should be assertEqual 2015-07-28 13:59:04 -04:00
David Baumgold
51976b0616 Minor improvements to learner profile tests 2015-07-28 13:55:49 -04:00
mushtaqali
bfd49b2cd0 Fix markdown editor reference link having colon issue 2015-07-28 22:32:57 +05:00
Awais Jibran
ece64cf2fd Merge pull request #9097 from edx/aj/plat-760-fix-flaky-test_import_timestamp 
Fixed Flaky test
 2015-07-28 22:30:42 +05:00
Awais Jibran
bceb2ae378 Fixed Flaky test (TestLibraryImport.test_import_timestamp) 
PLAT-760
 2015-07-28 21:04:16 +05:00
Clinton Blackburn
f33b451e8a Merge pull request #9081 from edx/clintonb/course-detail-whitelist 
White-listed course detail API calls
 2015-07-28 11:01:11 -04:00