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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Smith
7041b497b2 Merge branch 'derf/pymongo_2.8' of github.com:edx/edx-platform into derf/pymongo_2.8 2015-07-31 10:07:12 -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
Zia Fazal
a169b47c48 remove certificates menu if html certs not enabled 
fixed quality violation
 2015-07-31 17:40:40 +05:00
Sarina Canelake
00af8222f6 Update translations (autogenerated message) 2015-07-31 08:23:49 -04:00
Tim Krones
050b747b1d Display start date, end date, and number of sections (weeks) on "Course 
Info" tab of instructor dashboard.
 2015-07-31 09:38:09 +02: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
Albert Liang
46434582c8 Deactivate HTTPS on dev and devstack 
When running locally, XBlocks which access third-party software no longer
cause server errors.

Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'.
This meant that XBlocks attempted to use SSL when dealing with third-party
components like LTI.  Since SSL is not enabled on devstack, this caused server
errors whenever these features ran.
 2015-07-30 13:22:33 -07: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
Vedran Karačić
c9b65b0c2e Merge pull request #9131 from edx/revert-9037-vkaracic/TNL-394-confirmation-msg 
Revert "TNL-394: Fixed the confirmation message"
 2015-07-30 17:53:22 +02:00
Davorin Šego
65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements 
Improve course discovery filtering and empty search
 2015-07-30 17:34:39 +02:00
Peter Fogg
95b8d72347 Revert "Remove unnecessary DB call in team pagination." 
This reverts commit 948f652cf0.
 2015-07-30 10:52:13 -04:00
Jim Abramson
bf00fe0ecb Merge pull request #9124 from edx/jsa/no-course-discovery-in-devstack 
disable course discovery feature by default in devstack.
 2015-07-30 10:33:06 -04:00
Peter Fogg
7b01ed6171 Merge pull request #9102 from edx/peter-fogg/indices-teams 
Add index on CourseTeam name.
 2015-07-30 10:32:31 -04:00
Vedran Karačić
9ddf5c2e1e Revert "TNL-394: Fixed the confirmation message" 2015-07-30 16:09:48 +02:00
Christine Lytwynec
bb3a281a2b generate diff-coverage report in JS jenkins build 2015-07-30 10:07:00 -04:00
Davorin Šego
a7f2b025a9 Delete null_handler.py 2015-07-30 16:00:31 +02:00
Ahsan Ulhaq
ea183283bb Merge pull request #9073 from edx/ahsan/ECOM-1917-Copy-styling-for-credit-messages-on-dashboard 
Copy & Styling for Credit messages on Dashboard
 2015-07-30 15:30:34 +05:00
Ahsan Ulhaq
08165e8823 Update ICRV version 2015-07-30 14:35:11 +05:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard 
ECOM-1917
 2015-07-30 14:33:40 +05:00
Zia Fazal
3a6b2c30b5 hide certificate configuration activate/deactivate and delete buttons 
added line break
 2015-07-30 11:20:04 +05:00
John Baker
b5c2e9ccec Merge pull request #9108 from edx/merge-release-into-master 
Merge release into master
 2015-07-29 19:00:35 -04:00
Davorin Sego
73f163091f Initial idea 2015-07-30 00:42:49 +02:00
Braden MacDonald
f776b81853 Make email addresses in SAML metadata fully configurable 2015-07-29 14:48:31 -07:00