Commit Graph

3684 Commits

Author SHA1 Message Date
Eric Fischer
94f5ccbb85 Merge pull request #15488 from edx/edx-ora2/rc
edx-ora2 1.4.4 release
2017-07-07 11:48:46 -04:00
Ned Batchelder
fdd974ddbd Use commit hashes for certain third-party repos 2017-07-07 07:15:04 -04:00
Eric Fischer
577d44b0db edx-ora2 1.4.4 2017-07-06 16:41:31 -04:00
Dennis Jen
19c4d799e1 Upgrade proctoring (supports django 1.11) 2017-07-06 16:29:47 -04:00
Brian Mesick
af43d08b22 Revert "Upgrade django-ratelimit-backend to 1.1.1" 2017-07-06 16:18:02 -04:00
Mushtaq Ali
d2b420a9a5 Change opacity and user messages 2017-07-06 12:35:07 +05:00
Mushtaq Ali
eabfba48a2 Change video image requirements text hover - EDUCATOR-577 2017-07-06 12:35:06 +05:00
Mushtaq Ali
cf6200cbb3 Add frontend video image validations - EDUCATOR-447 2017-07-06 12:35:05 +05:00
Muhammad Ammar
dca12d65c2 Save or update course video image - TNL-6762 2017-07-06 12:35:00 +05:00
bmedx
692f7ae158 Remove django-mako requirement 2017-07-05 17:33:15 -04:00
Brian Mesick
bc485ea580 Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482
Upgrade django-ratelimit-backend to 1.1.1
2017-07-05 16:54:49 -04:00
bmedx
89f03ff5d9 Upgrade help-tokens to 1.0.3 2017-07-05 16:24:57 -04:00
Clinton Blackburn
e1312b3812 Updated Django Waffle to 0.12.0 2017-07-05 11:30:02 -04:00
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -04:00
Kevin Falcone
0c4fa745bd Bump up the NewRelic plugin version
Most bugfixes are python3 or Tornado specific, but several releate
to Django 1.10 and they improved transaction traces since we last
updated.

https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes/python-agent-286370
2017-07-03 12:55:54 -04:00
bmedx
3e74212979 Upgrade django-crum to 0.7.2 2017-06-29 15:48:11 -04:00
Brian Mesick
c8681746ad Merge pull request #15402 from edx/bmedx/django_1.11_upgrade_django_pyfs_PLAT-1594
Upgrade django-pyfs to 1.0.6
2017-06-28 13:25:44 -04:00
Feanil Patel
64d5425209 Revert "Bump problem builder to v2.6.9." 2017-06-26 16:19:17 -04:00
Feanil Patel
00ba9c7062 Merge pull request #14327 from open-craft/mtyaka/problem-builder-2.6.6
Bump problem builder to v2.6.9.
2017-06-26 12:51:34 -04:00
Brian Mesick
f9216656fc Merge pull request #15393 from edx/bmedx/django_1.11_upgrade_mock_django_PLAT_1494
Remove mock-django dependency
2017-06-23 16:36:50 -04:00
Brian Mesick
7b439d020b Merge pull request #15401 from edx/bmedx/django_1.11_upgrade_statici18n_PLAT-1572
Upgrade django-statici18n to 1.4.0
2017-06-23 16:34:03 -04:00
bmedx
26e2e9940e Upgrade django-pyfs to 1.0.6
- PLAT-1594 upgrade to official Django 1.11 support version
2017-06-23 15:26:00 -04:00
bmedx
e76936561b Upgrade django-statici18n to 1.4.0
- PLAT-1572 upgrade to official Django 1.11 support version
2017-06-23 14:19:06 -04:00
Brittney Exline
611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context.
When a user comes in through an sso provider and arrives at the login
or registration page, there is a warning message that comes up to indicate
that the user has to take an action to sign in and register and thus
link their sso account to their edx account. However, it is confusing,
particularly for the enterpise context. This diff disables these messages
from being rendered if these pages are being shown in an enterprise context.
2017-06-23 14:03:53 -04:00
Brian Beggs
e25553b64b Revert "Test out DRF 3.6"
This reverts commit f8d3f88956.
2017-06-23 10:24:04 -04:00
Brian Beggs
f8d3f88956 Test out DRF 3.6 2017-06-23 10:21:06 -04:00
bmedx
41def5c938 Remove mock-django dependency
- PLAT-1494 since mock-django only seems to support up to Django 1.9a1, and is only used in one file we're opting to try to simplify and remove the dependency.
2017-06-23 09:22:11 -04:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00
Brittney Exline
d80be3add0 Increments the enterprise version to include a change that will restore
the ability to create clients for the catalog api.
2017-06-21 16:06:34 -04:00
Eric Fischer
b1e3a45461 Merge pull request #15377 from edx/efischer/ora2_1.4.3
edx-ora2 update
2017-06-21 14:34:25 -04:00
Eric Fischer
582e71e8b7 edx-ora2 update 2017-06-21 13:29:03 -04:00
Douglas Hall
f5758e00f3 Upgrading edx-enteprise package to 0.36.2 2017-06-21 09:43:16 -04:00
Uman Shahzad
8b65ca17c5 Migrate to latest, split python-social-auth.
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
2017-06-20 22:05:36 +05:00
Douglas Hall
f58277cc10 Upgrading the edx-enterprise package to 0.35.2. 2017-06-20 11:33:31 -04:00
Eric Fischer
84aa4a2631 Merge pull request #15367 from edx/efischer/celeryutils_pypi_fun_times
edx-celeryutils 0.2.4
2017-06-20 10:48:24 -04:00
Adam
22a5bd3501 Merge pull request #15324 from ravi-ojha/educator_273
Bump version of xblock-poll that resolves EDUCATOR-273
2017-06-20 10:34:07 -04:00
Eric Fischer
112a5662ec edx-celeryutils 0.2.4 2017-06-20 10:20:06 -04:00
Matjaz Gregoric
f0b2a91789 Bump problem builder to v2.6.9. 2017-06-20 15:58:38 +02:00
Eric Fischer
49c0342e73 Merge pull request #15167 from edx/efischer/update_celeryutils
Make use of ChordableDjangoBackend
2017-06-20 09:45:07 -04:00
Ravi Ojha
56cf90f8e9 Bump version of xblock-poll that resolves EDUCATOR-273 2017-06-20 02:43:46 +05:30
Douglas Hall
6910a3a0b7 Upgrading edx-enterprise package to 0.35.0 2017-06-16 13:39:33 -04:00
Isaac Slavitt
ff1a9a1590 Add cryptography package to sandbox environment
The cryptography package is designed to be the "cryptographic
standard library" for Python developers. (Documents are online
at https://cryptography.io/en/latest/).

The use case for adding this is to bring encrypted claims from
outside edX into a course for assigning a grade using CAPA.
As an example, imagine that users enrolled in a computer security
and penetration testing class on edX are challenged to advance
as many levels as possible in a certain capture-the-flag (CTF)
puzzle hosted on an external app.

The external platform may provide the users an encrypted, tamper-
resistant token allowing them to enter that into an edX CAPA
auto-graded exercise in order for the edX user to claim credit
within the edX course.

For example, the external platform might take some plaintext JSON
like this:

    {'user': 'isaac@example.com', 'score': 30}

And then use the Fernet symmetric encryption to give the user a
token like this:

    gAAAAABZQX8xwdtvpdnTtuXWQUnbTPVA-Gw5dz6-kXFuKi0_2jpqFkSG
    Dhy-BugBx38xhUfbmao9KwIhcxZt0uBAE0WT_uzjagLn7BwRIQP4Ap_B
    r4e797QQllWcaHXVHhskHk6ETohc

Because the external platform and the `loncapa/python` script share
a secret, this token (1) means nothing to the user, (2) can be
decrypted on the edX side and used accordingly, and (3) won't
work if tampered with in between.

There are probably other use cases for using tokens, HMAC, or
encryption with autograded exercises. In any case, the crytography
library is well tested and reliable, so adding it presents little
risk and will probably benefit others.
2017-06-14 14:13:29 -04:00
Feanil Patel
3fbe60ef57 Merge pull request #14463 from edx/robrap/edx-search-upgrade
[DELAY MERGE] TNL-6319: Upgrade edx-search for ES 1.x upgrade.
2017-06-13 14:32:26 -04:00
Eric Fischer
4af499cdd5 edx-ora2 1.4.2 release 2017-06-13 12:58:19 -04:00
Brian Beggs
4eba6f0c13 Upgrade pyyaml to 3.12 2017-06-12 11:08:05 -04:00
Brian Beggs
6643e7e1cd Merge pull request #15275 from edx/bbeggs/paramiko-1.18.1
Remove paramiko requirement
2017-06-09 11:30:07 -04:00
Brian Beggs
9e6e97c0ee remove paramiko 2017-06-08 16:34:32 -04:00
Michael Roytman
c7ae718acb revert 15259 2017-06-08 11:41:54 -04:00
Michael Roytman
4e9d41f222 Merge pull request #15259 from edx/mroytman/update-edx-search-version
update edx-search to version 1.0.1
2017-06-07 15:27:36 -04:00
Eric Fischer
99795d708c Make use of ChordableDjangoBackend
Includes edx-celeryutils, django-celery version bump
2017-06-07 14:10:55 -04:00