Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3684 Commits

Author SHA1 Message Date
Douglas Hall
167472da84 Merge pull request #16072 from open-craft/uman/ent-0.46.8 
[ENT-644] Bump edx-enterprise to 0.46.8.
 2017-09-25 10:09:35 -04:00
Cliff Dyer
eb463bbd0d Merge branch 'master' into cliff/pb-v2.7.7 2017-09-22 16:29:08 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -04:00
Uman Shahzad
a8df3d8844 Bump edx-enterprise to 0.46.8. 
This removes the `require_account_level_consent` field
without a migration.

The migration comes next.
 2017-09-22 15:09:38 +05:00
Douglas Hall
10a065990b Merge pull request #16064 from open-craft/uman/ent-0.46.5 
[ENT-644] Bump edx-enterprise to 0.46.7.
 2017-09-22 05:47:16 -04:00
J. Cliff Dyer
e99c4c4d3a Bump problem-builder requirement to 2.7.7. 2017-09-21 11:33:11 -04:00
Feanil Patel
c66c04d937 Merge pull request #16059 from open-craft/cliff/pb-v2.7.6 
Bump problem-builder to 2.7.6.
 2017-09-21 11:00:50 -04:00
Uman Shahzad
69a875a0de Bump edx-enterprise to 0.46.7. 2017-09-21 18:27:56 +05:00
Uman Shahzad
e785074560 Merge pull request #16053 from open-craft/uman/ent-0.46.4 
[ENT-428] Bump edx-enterprise to 0.46.4.
 2017-09-21 13:51:32 +05:00
Brian Beggs
0971a2784a Allow watch_assets observer to use custom timeout value 
This has the effect of making the observer poll less regularly, which
allows developers to choose between rapid asset updates and resource
usage.
 2017-09-20 14:38:41 -04:00
Brian Mesick
bf47ba855f Merge pull request #16014 from edx/bmedx/upgrade_django_openid_auth 
Upgrade edx-django-openid-auth
 2017-09-20 09:56:19 -04:00
noraiz-anwar
6f5a4d54c2 upgrade lti-consumer xblock 2017-09-20 14:43:05 +05:00
Uman Shahzad
0ffac802e8 Bump edx-enterprise to 0.46.4. 2017-09-20 05:16:52 +05:00
Matt Tuchfarber
b55525eb76 Bump edx-enterprise version 2017-09-19 14:04:31 -04:00
J. Cliff Dyer
9fe4d09c94 Bump problem-builder to 2.7.6. 
Removes deprecated Answer.course_id field, without migrating the
associated database table.
 2017-09-19 10:20:39 -04:00
Douglas Hall
3828f31c74 Upgrade edx-enterprise to version 0.46.1. 
https://github.com/edx/edx-enterprise/compare/0.46.0...0.46.1
 2017-09-18 10:04:45 -04:00
Nimisha Asthagiri
3d15bdca58 Merge pull request #16028 from edx/ret/log-level-per-message 
Schedules/ACE - support debug logging via waffle
 2017-09-18 08:51:56 -04:00
Nimisha Asthagiri
813007bb49 Schedules/ACE - support debug logging via waffle 2017-09-16 22:03:28 -04:00
Awais Jibran
468fd9991c Merge pull request #16029 from edx/aj/up-proctoring-to-1.2.1 
Upgrade proctoring to 1.2.1
 2017-09-16 12:58:55 +05:00
Bill Filler
efa0ef4ae8 Upgrade edx-enterprise to 0.46.0 2017-09-15 16:33:16 -04:00
Awais Jibran
ee6899592a Upgrade proctoring to 1.2.1 2017-09-16 00:23:06 +05:00
bmedx
f2ad2601f7 Upgrade edx-django-openid-auth to 0.14 2017-09-15 09:18:44 -04:00
Douglas Hall
51beb277d1 Merge pull request #16024 from edx/douglashall/ENT-638 
Upgrade edx-enterprise to 0.45.0.
 2017-09-15 05:31:42 -04:00
Douglas Hall
c243fb52f3 Upgraded edx-enterprise to 0.45.0. 
ENT-638
 2017-09-14 14:35:45 -04:00
Kevin Falcone
ef13c0cb4f pygments < 2.1 had a shell injection attack 
We only really use it in tests, but if tests still pass this should
be an easy upgrade.
 2017-09-14 12:49:36 -04:00
John Eskew
0eba0078e2 Bump versions of edx-django-oauth2-provider and edx-oauth2-provider 2017-09-13 13:07:59 -04:00
Douglas Hall
04a61ff6a5 Merge pull request #15970 from open-craft/uman/enterprise-support-url 
[ENT-486] Add `ENTERPRISE_SUPPORT_URL` to environment config & version bump edx-enterprise to 0.44.0.
 2017-09-13 09:11:31 -04:00
Uman Shahzad
5fc4bad9ee Add ENTERPRISE_SUPPORT_URL to environment config and bump edx-enterprise to 0.44.0. 2017-09-13 07:42:09 -04:00
Brian Mesick
281c59daf8 Merge pull request #15958 from edx/bmedx/add_edx_lang_map_zh_hans 
Add language mapping for zh_CN to zh_HANS
 2017-09-12 10:19:41 -04:00
Calen Pennington
cd4ebaf23c Only send one email even if there are multiple enrollments by the same user on the same day 2017-09-12 08:23:21 -04:00
Uman Shahzad
feaee089d5 Bump edx-enterprise to 0.43.5 2017-09-08 20:03:16 +05:00
bmedx
454649c44d Add language mapping for zh_CN to zh_HANS, upgrade i18n-tools 
- Bump version of i18n_tools to v0.3.10
- Add mapping to allow i18n_tools to copy the zh_CN translations to
zh_HANS in preparation for the Django 1.11 upgrade.
 2017-09-07 13:28:16 -04:00
Brittney Exline
053639ab62 ENT-615/ENT-617 Upgrade enterprise package to latest version 2017-09-07 11:02:33 -04:00
Eric Fischer
179774e107 edx-ora2 2.1.1 2017-09-06 14:40:11 -04:00
Eric Fischer
29f6d5d610 Merge pull request #15954 from edx/ora/2.0.5 
ORA patch release
 2017-09-05 14:55:25 -04:00
Eric Fischer
a67f9ee7ff ORA patch release 2017-09-05 14:03:41 -04:00
Brittney Exline
ba597331d7 ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint 
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
 2017-09-05 13:32:24 -04:00
Nimisha Asthagiri
7953322faf PIN version number of ACE 2017-09-01 14:58:48 -04:00
Eric Fischer
44013d700e Revert "Merge pull request #15939 from edx/efischer/ora_204" 
This reverts commit a403fd1491, reversing
changes made to b31287e264.

500 errors on prod, need to rethink this fix.
 2017-09-01 12:57:39 -04:00
Brittney Exline
740aad4c77 Merge pull request #15923 from edx/saleem-latif/ENT-608 
ENT-608: edx-enterprise version upgrade to 0.42.0
 2017-09-01 12:53:57 -04:00
Gabe Mulley
873f7cbd8d restrict ace deps 2017-09-01 10:44:05 -04:00
Saleem Latif
8fe73a9b3e edx-enterprise version upgrade to 0.42.0 2017-09-01 10:24:45 -04:00
Nimisha Asthagiri
c08060a0bb Merge pull request #15745 from edx/ret/triggered-email 
RET triggered emails
 2017-08-31 20:44:43 -04:00
Eric Fischer
d02c580123 edx-ora2 2.0.4 release 2017-08-31 17:21:24 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Uman Shahzad
197c06a1e4 Bump edx-enterprise to 0.41.0. 
This incorporates a migration that copies data
from certain models to another.
 2017-08-31 10:41:45 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Ari Rizzitano
19dec17e7b Merge pull request #15806 from edx/ari/ss-review-report 
expand proctored exam report to include violation summary
 2017-08-29 10:10:50 -04:00
Douglas Hall
6904fafc4a Upgrade edx-enterprise to 0.40.7. 
https://github.com/edx/edx-enterprise/compare/0.40.6...0.40.7

ENT-612
 2017-08-24 12:46:47 -04:00
Feanil Patel
d6e75a8523 Merge pull request #15862 from open-craft/cliff/pb-migrate-keys 
Update problem-builder requirement to 2.6.5patch2 to migrate keys.
 2017-08-24 11:57:26 -04:00