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
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
jsa
810d623325
Add historical course enrollment table.
...
XCOM-442
2015-07-29 17:35: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
Davorin Sego
a62ef9ffa9
quality
2015-07-29 21:24:38 +02:00
Davorin Sego
7a923cf520
fix errors
2015-07-29 20:30:39 +02: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
Davorin Sego
ab923ea250
use a universal null handler
2015-07-29 19:07:00 +02: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
Davorin Sego
dd457c2f49
Revert "a different take"
...
This reverts commit 74d7b2a7d6
2015-07-29 18:13:19 +02: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
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
Chris Rodriguez
2bea68fc58
Sending focus to modal in CMS
2015-07-29 09:19:36 -04:00
