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

31907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Peter Fogg
b47922cea0 Make team chat icon appear. 2015-08-03 10:09:40 -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
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
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
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
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
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
Ned Batchelder
1922980657 CHANGELOG is dead. 2015-07-31 10:22:38 -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
tlindaliu
3b483d14bc MA-851: Add access response information into view_course_access 2015-07-31 09:30:40 -04:00
Sarina Canelake
e93462c73f Merge pull request #9148 from edx/sarina/20150731-translations-update 
Update translations (autogenerated message)
 2015-07-31 09:26:35 -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
Sarina Canelake
00af8222f6 Update translations (autogenerated message) 2015-07-31 08:23:49 -04:00
Zia Fazal
614baab35a Merge pull request #9111 from edx/ziafazal/SOL-1077 
SOL-1077: hide certificate configuration activate/deactivate and delete buttons if user is not global staff
 2015-07-31 11:12:24 +05:00
Braden MacDonald
99f4ec210e Merge pull request #9145 from open-craft/bump-problem-builder 
Bump problem builder version to avoid 500 error from PLAT-772
 2015-07-30 15:20:53 -07:00
Braden MacDonald
7aa7664ea9 Bump problem builder version to avoid 500 error from PLAT-772 2015-07-30 14:10:29 -07:00
Will Daly
0662f12743 Merge pull request #9139 from edx/merge-release-into-master 
Merge release into master
 2015-07-30 14:07:14 -07:00
cahrens
9d3e2c1a08 Ignore team membership for privileged users. 2015-07-30 17:06:40 -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
Ben McMorran
4a78271851 Move is_commentable_cohorted to django_comment_client 2015-07-30 20:59:34 +00:00
David Baumgold
afeef4cb9e Fix setuptools infinite loop bug triggered by python-saml 2015-07-30 16:23:04 -04:00
David Baumgold
957c8144ca Upgrade MySQL-python to 1.2.5 
This reverts commit 2ff0f636ed.
 2015-07-30 16:23:04 -04:00
David Baumgold
ebe8b25210 Upgrade setuptools to 18.0.1 
This reverts commit 1a3f0958b9.
 2015-07-30 16:22:42 -04:00
Peter Fogg
b2545ce8a8 Merge pull request #9137 from edx/peter-fogg/test-team-list-fix 
Revert "Remove unnecessary DB call in team pagination."
 2015-07-30 15:38:07 -04:00
Christine Lytwynec
4848086175 Merge pull request #9130 from edx/clytwynec/js-diff-coverage 
generate diff-coverage report in JS jenkins build
 2015-07-30 15:16:10 -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
Will Daly
3e8eac90d2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-30 11:43:19 -07:00
Will Daly
50247472f0 Merge pull request #9136 from edx/patch/2015-07-29 
Multiple Patches
 2015-07-30 11:38:07 -07:00
cahrens
01c22531d7 Add team permission check on commentable_id. 
TNL-2864
 2015-07-30 13:56:08 -04: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