Utkarsh
d881067f84
Merge pull request #8835 from edx/utkjad/injecting_callstackmanager
...
[PLAT -758] Making Call Stack Manager work in StudentModule and StudentModuleHistory, add @trackit, @wrapt dependency, and refine conditions
2015-08-27 13:42:15 -04:00
Will Daly
3c400783dd
Merge pull request #9467 from edx/will/upgrade-django-mptt
...
Upgrade django-mptt to 0.7.4
2015-08-27 07:45:22 -07:00
Jesse Zoldak
15ce2e10c6
Merge pull request #9484 from edx/zoldak/coverage-371
...
Updated coverage to 3.7.1
2015-08-27 10:18:27 -04:00
utkjad
387303d364
Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and refining implementation[PLAT-758]
2015-08-26 22:29:43 +00:00
David Ormsbee
ff62a8eaaa
Merge branch 'release' into release-2015-08-26-conflict
2015-08-26 14:28:35 -04:00
Jesse Zoldak
1340ec8c84
Updated coverage to 3.7.1
2015-08-26 13:44:30 -04:00
Will Daly
f71f7ff7cd
Upgrading django-model-utils to 2.3.1
2015-08-25 09:31:41 -07:00
Will Daly
1e14de689d
Upgrade django-mptt to 0.7.4
2015-08-25 09:22:22 -07:00
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
Chris Dodge
01425c0baf
bump version of edx-proctoring
2015-08-21 16:55:37 -04:00
Will Daly
a7e9789021
Merge pull request #9424 from edx/will/remove-unused-dependencies
...
Remove django-followit and django-keyedcache
2015-08-21 10:58:24 -07: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
5d53c4a12a
Remove django-followit and django-keyedcache
2015-08-21 10:09:11 -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
Will Daly
b0e12b5f3d
Merge pull request #9411 from edx/will/upgrade-django-babel-underscore
...
Upgrade django-babel-underscore to 0.3.0
2015-08-20 20:03:12 -07:00
Will Daly
f4b0d55a2d
Upgrade django-cors-headers to 1.1.0
2015-08-20 12:43:50 -07:00
Will Daly
cf259b42e7
Upgrade django-babel-underscore to 0.3.0
2015-08-20 12:37:53 -07: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
Ned Batchelder
0fed2f5987
Merge pull request #9364 from edx/ned/django-1-4-22
...
Upgrade Django to 1.4.22
2015-08-19 15:06:16 -04: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
Ned Batchelder
c3234c1cfc
Upgrade Django to 1.4.22
...
https://www.djangoproject.com/weblog/2015/aug/18/security-releases/
2015-08-18 14:38:43 -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
Ben Patterson
7734674c68
Merge pull request #9284 from edx/benp/update-nose-aug2015
...
Update to latest version of nose.
2015-08-12 15:04:17 -04:00
Peter Fogg
eafb07552a
Merge pull request #9287 from edx/release
...
Release
2015-08-12 13:06:39 -04:00
Ben Patterson
1c2ad178bf
Update to latest version of nose.
...
This will allow us to take advantage of bug fixes and other improvements.
2015-08-12 09:05:36 -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
Ned Batchelder
ceb5655b2d
Merge pull request #9171 from edx/ned/update-pylint
...
Update pylint and astroid, reduces pylint count by 400
2015-08-04 09:28:35 -04:00
Ned Batchelder
52acdae60c
Update pylint and astroid, reduces pylint count by 400
2015-08-03 11:49:54 -04:00
Calen Pennington
704ae7139a
Add a subclass-implementation of the UserStateClient tests
2015-08-01 08:12:04 -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
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
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
