Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,596 Commits 1 Branch 0 Tags
cc460bbb0df394aa22e5ccab375622b047fd2f4b
Commit Graph

1608 Commits

Author SHA1 Message Date
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
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
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
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
Eric Fischer
041c94c263 edx-celeryutils v0.1.5 2017-06-07 11:44:07 -04:00
Michael Roytman
fa5b9b7a4a update edx-search to version 1.0.1 2017-06-07 10:31:02 -04:00
Ned Batchelder
c8accbc30e Merge pull request #15131 from edx/nedbat/help-tokens-from-pypi 
Install help-tokens from PyPI
 2017-06-06 17:48:39 -04:00
Eric Fischer
3ddb74540b Merge pull request #15239 from edx/efischer/celery_utils_0.1.4 
Bump edx-celeryutils to 0.1.4
 2017-06-05 10:45:27 -04:00
Qubad786
f5e01d4959 bump LTI Consumer XBlock to latest version 2017-06-05 12:55:44 +05:00
Eric Fischer
3acd9674f0 Bump edx-celeryutils to 0.1.4 2017-06-02 16:08:13 -04:00
Eric Fischer
83465e3626 update ORA2 to 1.4.1 2017-06-02 15:26:15 -04:00
Robert Raposa
b621eb2166 Add instructions. 2017-05-31 15:30:28 -04:00
Andy Armstrong
f81c21902e Add isort to edx-platform 
LEARNER-1168
 2017-05-25 11:39:43 -04:00
Diana Huang
c199e46cd6 Update edx-search version. 2017-05-24 11:47:45 -04:00
zubair-arbi
d2eea88b98 bump enterprise version from 0.33.16 to 0.33.19 
ENT-347
 2017-05-22 16:22:04 +05:00
UmanShahzad
0eb6b2a6be Rename ActiveTable max_score to maximum_score to avoid conflicts. 
See https://openedx.atlassian.net/browse/EDUCATOR-338
We defined max_score as a Float XBlock field, while
a method max_score exists that was getting conflicts
with it.
 2017-05-17 10:48:53 -04:00
Ned Batchelder
9ba573e44f Install help-tokens from PyPI 2017-05-16 17:03:00 -04:00
Christina Roberts
21a5a42571 Merge pull request #15113 from edx/christina/ed396 
Update version of proctoring.
 2017-05-15 15:48:58 -04:00
cahrens
94ed50cb52 Update version of proctoring. 
EDUCATOR-396
 2017-05-15 14:01:40 -04:00
Brittney Exline
cb2fa7610b ENT-359 Bump enterprise package version 2017-05-15 12:05:07 -04:00
Ned Batchelder
2dfb6ad2b4 Merge pull request #15101 from open-craft/mtyaka/matplotlib-install-fix 
Move matplotlib to post requirements.
 2017-05-15 07:57:37 -04:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Matjaz Gregoric
aca929de69 Move matplotlib to post requirements. 
Matplotlib depends on numpy, so we want to ensure the correct version
of numpy is already installed when we attempt to install matplotlib.
 2017-05-12 11:16:34 +02:00
zubair-arbi
cb8095a745 bump enterprise version from 0.33.13 to 0.33.15 
ENT-330
 2017-05-12 12:10:45 +05:00
Andy Armstrong
482f76527e Merge pull request #15064 from edx/andya/welcome-message 
Show a welcome message on the course home page
 2017-05-10 17:40:25 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page 
LEARNER-879
 2017-05-10 16:53:15 -04:00
Matt Drayer
534590143d mattdrayer/edx-enterprise-0.33.13: Update package reference 2017-05-09 11:22:18 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Brittney Exline
907cb055d8 ENT-351/ENT-362 Enterprise package version bump 2017-05-04 11:14:19 -04:00
Eric Fischer
be3e603e35 Merge pull request #15007 from edx/efischer/ora_release 
Update edx-ora2 to 1.4.0
 2017-05-04 09:37:32 -04:00