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

31936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8477146ca8 Merge pull request #9189 from edx/ned/fix-django-debug-toolbar-settings 
We should only add the DjDT urls if it is enabled.
 2015-08-04 12:56:29 -04:00
Ned Batchelder
8476baf4dd We should only add the DjDT urls if it is enabled. 2015-08-04 11:01:45 -04:00
Ned Batchelder
69be9000ab Merge pull request #9153 from edx/rc/2015-08-04 
Rc/2015-08-04
 2015-08-04 10:38:49 -04:00
Dennis Jen
009e8a1050 Merge pull request #9085 from edx/dsjen/return-courses-via-roles 
Optimize OpenID Course Claims for non-global-staff users.
 2015-08-04 09:37:23 -04: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
Dennis Jen
f0d1772da3 Optimize OpenID Course Claims for non-global-staff users. 2015-08-03 16:48:28 -04:00
Clinton Blackburn
6e0013c4cc Merge pull request #9174 from edx/clintonb/commerce-api-course-name 
Exposing course name via Commerce API
 2015-08-03 16:02:18 -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
Clinton Blackburn
880da5a09d Exposing course name via Commerce API 
The course now includes a read-only name attribute.

XCOM-536
 2015-08-03 15:16:45 -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
David Baumgold
386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block 
Remove unneeded block from courses.html template
 2015-08-03 13:13:58 -04:00
Diana Huang
a9de5c90a4 Merge pull request #9050 from edx/christina/tnl-2677 
Correct email settings URL and rename variable.
 2015-08-03 12:56:35 -04:00
John Eskew
ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests 
User state client tests
 2015-08-03 12:25:05 -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
Ned Batchelder
52acdae60c Update pylint and astroid, reduces pylint count by 400 2015-08-03 11:49:54 -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
Peter Fogg
051e838ffb Merge pull request #9166 from edx/peter-fogg/team-chat-icon 
Make team chat icon appear.
 2015-08-03 11:09:39 -04:00
Ned Batchelder
d3986c88f1 Merge pull request #9161 from edx/andya/fix-forums-bug 
Fix forums escaping bug
 2015-08-03 10:58:13 -04:00
Marco Morales
90fcf4646a adds back in correct and incorrect styling for annotations problems 2015-08-03 10:57:31 -04:00
Peter Fogg
b47922cea0 Make team chat icon appear. 2015-08-03 10:09:40 -04:00
David Baumgold
7adaa22186 Remove unneeded block from courses.html template 2015-08-03 09:47:19 -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
Linda Liu
8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access 
Add access response information into view_course_access
 2015-08-01 13:55:25 -04:00
Calen Pennington
83c10331fa Add a test of submission history display 2015-08-01 08:13:25 -04:00
Calen Pennington
6ba611cb5f Remove remove_input_state.py, as it was one-time fix code, and is not worth porting to the new interface 2015-08-01 08:13:25 -04:00
Calen Pennington
aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests 
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
 2015-08-01 08:13:25 -04:00
Calen Pennington
53b37e7412 Remove extraneous documentation, contracts, and method definitions 2015-08-01 08:13:25 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -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
Ben McMorran
6530d5e3ec Merge pull request #9160 from edx/benmcmorran/dont-cohort-teams 
TNL-2913 Extend is_commentable_cohorted to support teams
 2015-07-31 21:46:56 -04:00
Andy Armstrong
96e14e3f8b Fix forums escaping bug 
TNL-2919
 2015-07-31 19:40:04 -04:00
Utkarsh
3de9a9b44a Merge pull request #9156 from edx/utkjad/Removing_@contract_from_DXUSC_inuser_state_client.py 
Removing @contract from `edx-platform/lms/djangoapps/courseware/user_state_client.py`
 2015-07-31 16:34:41 -04:00
Ben McMorran
6d48e1360d Extend is_commentable_cohorted to support teams 2015-07-31 20:22:31 +00: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
utkjad
b85b50d11a Removing @contract 2015-07-31 17:44:16 +00: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
cahrens
614a92957c Correct email settings URL and rename variable. 
TNL-2677
 2015-07-31 11:39:19 -04:00
Kyle McCormick
2e53b9e82c Merge pull request #9126 from edx/kyle/course-overviews-versioning 
WIP: MA-1063 Add versioning and timestamping to CourseOverview
 2015-07-31 11:22:58 -04:00
Ned Batchelder
337024bd98 Merge pull request #9150 from edx/ned/remove-changelog 
CHANGELOG is dead.
 2015-07-31 11:15:43 -04:00
Will Daly
663b7b9c14 Merge pull request #23 from edx/hotfix/2015-07-30 
Hotfix 2015-07-23
 2015-07-31 07:58:43 -07:00
Ben McMorran
3a70b87787 Merge pull request #9143 from edx/benmcmorran/move-is-commentable-cohorted 
Move is_commentable_cohorted to django_comment_client
 2015-07-31 10:43:53 -04:00
Diana Huang
bc2892f2d3 Merge pull request #9142 from edx/diana/context-aware-comment-client 
Make context for threads more implicit.
 2015-07-31 10:29:29 -04:00
Kyle McCormick
10aae0d480 MA-1063 Add versioning and timestamping to CourseOverview 2015-07-31 10:28:17 -04:00