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
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
Ahsan Ulhaq
08165e8823
Update ICRV version
2015-07-30 14:35:11 +05: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
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
Chris Dodge
6c3a902482
switch to using tags
2015-07-29 10:49:34 -04:00
Carson Gee
4b9792a149
Resolved LogHandler bug in rf6266
2015-07-28 19:14:51 -04:00
Carson Gee
1df53ac348
Merge pull request #9080 from mitocw/feature/cg/rfc6266_logger_issue
...
Resolved LogHandler bug in rf6266
2015-07-28 17:17:08 -04:00
Chris Dodge
81502176e1
Integrate timed and proctored exam authoring into Studio
2015-07-28 17:16:06 -04:00
Carson Gee
c19a683f15
Resolved LogHandler bug in rf6266
2015-07-28 16:25:36 -04:00
Renzo Lucioni
dfbfabd8cd
Merge pull request #9058 from edx/renzo/update-edx-oauth2-provider
...
Update edx-oauth2-provider to 0.5.6
2015-07-28 15:43:30 -04:00
Will Daly
47b81c9274
Allow users to submit initial verification at in-course checkpoints.
...
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
for the photo ID image of reverification attempts.
2015-07-27 19:32:18 -07:00
John Eskew
4de457495e
Bump mongoengine version to 0.10.0
2015-07-27 16:32:02 -04:00
Chris Dodge
8da554c57e
mistaken update of edx_proctoring repo hash update, this was meant for a working branch
2015-07-27 14:48:34 -04:00
chrisndodge
574319c412
Update github.txt
2015-07-27 14:17:26 -04:00
Renzo Lucioni
82fd897a8b
Update edx-oauth2-provider to 0.5.6
2015-07-24 13:48:29 -04:00
chrisndodge
5e195c8eeb
Merge pull request #8962 from edx/cdodge/proctoring-studio
...
Integrate timed and proctored exam authoring into Studio
2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961
Integrate timed and proctored exam authoring into Studio
2015-07-23 14:43:17 -04:00
Davorin Sego
a43cf589e0
Update edx-search, fix lms filter generator and courseware index tests
2015-07-22 16:44:01 +02:00
Ahsan Ulhaq
06b085f8b4
credit eligibility and payment receipt email
...
ECOM-1796
ECOM-1525
2015-07-22 12:34:38 +05:00
Renzo Lucioni
527def32e4
Update edx-oauth2-provider to 0.5.5
...
0.5.5 includes oauth2-provider's tests module
2015-07-21 11:37:07 -04:00
Renzo Lucioni
45ff29653b
Update edx-oauth2-provider to 0.5.4
2015-07-18 09:35:58 -04:00
Adam
2735b2b5bb
Revert "Decorated instructor dashboard with sudo_required."
2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee
Added DjangoSudo functionality for instructor dashboard and course team page
2015-07-16 11:14:11 +05:00
Renzo Lucioni
7f6e61b189
Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider
...
Update edx-oauth2-provider to 0.5.3
2015-07-15 17:22:45 -04:00
Renzo Lucioni
ea37ada4db
Update edx-oauth2-provider to 0.5.3
2015-07-15 15:58:00 -04:00
David Baumgold
2ff0f636ed
Revert MySQL-python upgrade
2015-07-15 09:37:04 -04:00
David Baumgold
1a3f0958b9
Revert setuptools upgrade
2015-07-15 09:36:56 -04:00
Fred Smith
088b20863e
upgrade to pymongo 2.8 to support updated authenticated method SCRAM-SHA-1 for mongodb-server 3.0
2015-07-14 11:49:45 -04:00
Dino Cikatic
862262bd2d
SOL-974 make index and remove calls use ES bulk API
2015-07-14 11:47:08 -04:00
David Baumgold
b6af608489
Update edx-ora2 and ease for lxml version compatibility
2015-07-14 11:09:18 -04:00
David Baumgold
fcf84e68d0
Update lxml to 3.4.4
2015-07-13 16:14:39 -04:00
Renzo Lucioni
77e0c049b8
Merge pull request #8836 from edx/renzo/edx-oauth2-provider-upgrade
...
Update edx-oauth2-provider to 0.5.2
2015-07-09 18:23:10 -04:00
Tyler Nickerson
825d99deee
Merge pull request #8865 from edx/nickersoft/jwt-security
...
XCOM-281: LMS now passes JWT issuer and expiration date to ecommerce API client
2015-07-09 16:43:07 -04:00
Nickersoft
2d13e9e886
LMS now passes JWT issuer and expiration date to ecommerce API client
2015-07-09 15:06:54 -04:00
Christine Lytwynec
45f487caa1
Merge pull request #8857 from edx/clytwynec/bok-choy-v0.4.3
...
update bok choy to version 0.4.3
2015-07-09 15:06:47 -04:00
David Baumgold
8a6e310d04
don't install ease in editable mode
2015-07-09 13:33:14 -04:00
David Baumgold
28433e1d53
Don't install nltk in editable mode
2015-07-09 13:31:18 -04:00
David Baumgold
a31f68520e
Use compatible versions of edx-ora2 and ease
2015-07-09 13:05:09 -04:00
David Baumgold
705fa6999a
Use a forked version of NLTK
...
So that we can use setuptools instead of distribute
2015-07-09 13:04:33 -04:00
Régis Behmo
95ebf7f675
Upgrade distribute to the latest stable version of setuptools
...
'distribute' is the ancestor of 'setuptools', and many packages require
setuptools to be installed.
Upgrade of MySQL-python from 1.2.4 to 1.2.5 is required because of an
incompatibility with setuptools>0.7.
2015-07-09 13:04:33 -04:00
Chris
e51a54a93b
Merge pull request #8797 from edx/clrux/ux-2323-ora-focus
...
ORA2: Focus and outline styles
2015-07-09 11:44:22 -04:00
Usman Khalid
d2336ce767
Update edx-ora2 to release-2015-07-09T14.47.
2015-07-09 19:59:29 +05:00
Christine Lytwynec
c5293788e1
update bok choy to version 0.4.3
2015-07-09 10:14:13 -04:00
Sarina Canelake
9fcd8ffaae
Upgrade Django 1.4 to the latest point release
2015-07-08 17:23:50 -04:00
Renzo Lucioni
82c96c87cb
Update edx-oauth2-provider to 0.5.2
2015-07-08 16:09:38 -04:00
Awais Jibran
ded7682090
Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2
...
TNL-2435
2015-07-06 18:26:00 +05:00
Ben Patterson
65a36a64df
Merge pull request #8686 from edx/benp/3bok-choy-check-invisible
...
Update to latest bok-choy. Update tests to be compatible with the updated `invisible` property.
2015-07-03 17:36:09 -07:00
