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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Braden MacDonald
|
f776b81853
|
Make email addresses in SAML metadata fully configurable
|
2015-07-29 14:48:31 -07:00 |
|
jsa
|
ba239125f1
|
disable course discovery feature by default in devstack.
|
2015-07-29 17:40:57 -04:00 |
|
Peter Fogg
|
dfafb03ebc
|
Add New Relic tracing to TeamsListView.get.
|
2015-07-29 17:38:41 -04:00 |
|
Peter Fogg
|
6473cd9bd8
|
Add index on CourseTeam name.
|
2015-07-29 17:38:41 -04:00 |
|
Ned Batchelder
|
e0edc51e07
|
Merge pull request #9120 from edx/ned/fix-djdt-circular-imports
Fix Django Debug Toolbar circular imports
|
2015-07-29 17:17:39 -04:00 |
|
Jolyon Bloomfield
|
d06abbf01e
|
Fixing indicator spacing
|
2015-07-29 17:10:08 -04:00 |
|
Kevin Falcone
|
49e2750dbe
|
Merge pull request #9119 from edx/jibsheet/rfc-requirements
Pin the rc6266 fork release
|
2015-07-29 16:59:29 -04:00 |
|
Christine Lytwynec
|
e793351576
|
Merge pull request #9101 from edx/clytwynec/update-testing-docs
Update testing.rst with info about bok choy accessibility tests
|
2015-07-29 16:35:47 -04:00 |
|
Ned Batchelder
|
7a7a867e6a
|
Fix Django Debug Toolbar circular imports
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:
http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup
Do that.
|
2015-07-29 16:18:38 -04:00 |
|
Kevin Falcone
|
898a43c49f
|
Pin the rc6266 fork release
If we don't pin to the version, pip will see that we have a version of
rfc6266 installed and be fine with it.
Yes, you have to say it twice.
|
2015-07-29 15:41:33 -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 |
|
John Eskew
|
c2c609ac9e
|
Merge pull request #9088 from edx/jeskew/PLAT-729_upgrade_mongoengine
Bump mongoengine version to 0.10.0
|
2015-07-29 13:02:33 -04:00 |
|
clrux
|
4e8aee7e85
|
Merge pull request #9067 from edx/clrux/ac-121-cms-modal-focus
Sending focus to modal in CMS
|
2015-07-29 12:47:51 -04:00 |
|
Ben McMorran
|
7794431fbb
|
Merge pull request #9117 from edx/benmcmorran/team-api-docs
Add discussion_topic_id to Team API docstrings
|
2015-07-29 11:49:09 -04:00 |
|
Christine Lytwynec
|
5e1ba5897c
|
Update testing.rst with info about bok choy accessibility tests
|
2015-07-29 11:44:15 -04:00 |
|
Ben McMorran
|
44d4e28053
|
Add discussion_topic_id to Team API docstrings
|
2015-07-29 14:52:58 +00:00 |
|
Chris Dodge
|
6c3a902482
|
switch to using tags
|
2015-07-29 10:49:34 -04:00 |
|
frances botsford
|
f8d1776698
|
Merge pull request #8972 from jolyonb/jolyonb/discussion
Small printing fixes (LMS)
|
2015-07-29 10:10:47 -04:00 |
|