Commit Graph

446 Commits

Author SHA1 Message Date
Kelketek
8912e02fd9 Update edx-submissions hash
Fixes an issue where install_prereqs would occasionally install an old version of pytz because edx-submissions included an old version in its requirements.
2015-08-24 09:10:49 -05:00
Will Daly
689efedeee Merge pull request #9427 from edx/will/update-django-extensions
Upgrade django-extensions to 1.5.5
2015-08-21 10:32:25 -07:00
Will Daly
0f590adde2 Upgrade django-extensions to 1.5.5 2015-08-21 09:16:56 -07:00
Will Daly
3901c03d30 Upgrade django-ipware to 1.1.0 2015-08-21 09:00:42 -07:00
chrisndodge
e9638039de Merge pull request #9420 from edx/cdodge/upgrade-edx-proctoring
Update edx-proctoring version to 0.7.1
2015-08-21 10:33:57 -04:00
Usman Khalid
9330ce6669 Merge pull request #9384 from edx/usman/update-ora
Update edx-ora2 to release-2015-08-19T17.17.
2015-08-21 19:30:10 +05:00
Chris Dodge
02d47d62f4 Update edx-proctoring version to 0.7.1 2015-08-21 09:27:38 -04:00
Ned Batchelder
1d23c55727 Merge pull request #9407 from edx/ned/getattr-lint-checker
Use latest edx-lint. Adds getattr/setattr string literal checking.
2015-08-20 15:32:03 -04:00
Will Daly
d4f521b43d Merge pull request #9332 from edx/will/final-icrv-access-control
In-Course Reverification Access Control
2015-08-20 09:24:05 -07:00
Ned Batchelder
36a7d1223e Use latest edx-lint. Adds getattr/setattr string literal checking.
There are 80 of these new violations in the tree, so up the lint
threshold also.
2015-08-20 11:45:44 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
E. Kolpakov
d486f14faf Hash Update: Poll XBlock (fixes TNL-3065) 2015-08-20 17:40:29 +03:00
Usman Khalid
6f636d7497 Update edx-ora2 to release-2015-08-19T17.17. 2015-08-19 22:22:16 +05:00
Chris Dodge
c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled 2015-08-19 11:07:14 -04:00
Ned Batchelder
2cfe2a4697 Use 0.1.3 of i18ntools 2015-08-19 10:08:52 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Ned Batchelder
ba8fd8f082 Update the version of django-staticfiles
This gets us:

- Static files can have non-ASCII characters in them.
- A useful log message if a file can't be found.
2015-08-10 12:08:53 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
2015-08-10 10:29:45 -04:00
Sarina Canelake
7d0cde60f4 Update i18n-tools [LOC-88] 2015-08-07 15:45:21 -04:00
Ahsan Ulhaq
ac9a291778 Update edx reverification block on plateform 2015-08-07 22:30:15 +05:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -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
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
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
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
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
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
David Baumgold
8a6e310d04 don't install ease in editable mode 2015-07-09 13:33:14 -04:00