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

1814 Commits

Author SHA1 Message Date
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
John Eskew
8b5b1eba86 Use Django 1.11 compatible version of django-countries. 2017-10-05 11:12:51 -04:00
Douglas Hall
1d1bd3ffa4 Merge pull request #16156 from open-craft/haikuginger/enterprise-0.50.1 
[ENT-649] Update Enterprise to 0.50.1
 2017-10-05 08:53:00 -04:00
attiyaishaque
a7e5d43f54 Update edx-proctoring to 1.2.3. 2017-10-04 12:32:26 +05:00
Jesse Shapiro
bf19ecf0dd Update Enterprise to 0.50.1 2017-10-03 22:37:13 -04:00
Brian Mesick
612c99ba3c Merge pull request #16130 from edx/bmedx/django-oauth-plus_PLAT-1743 
Change django-oauth-plus to use Github repo for Django 1.11 compat
 2017-10-03 16:51:31 -04:00
Douglas Hall
dafb07a706 Merge pull request #16151 from edx/douglashall/upgrade_enterprise_0_50_0 
Upgrade edx-enterprise to 0.50.0.
 2017-10-03 14:02:31 -04:00
Douglas Hall
5481bbf53f Upgrade edx-enterprise to 0.50.0. 
https://github.com/edx/edx-enterprise/compare/0.48.2...0.50.0
 2017-10-03 12:12:56 -04:00
Farhanah Sheets
f338fafbe5 Update to latest ora2 release version 2017-10-02 16:18:58 -04:00
Feanil Patel
734d2a7a8b Merge pull request #16069 from open-craft/cliff/pb-v2.7.7 
Bump problem-builder requirement to 2.7.7.
 2017-10-02 15:34:39 -04:00
bmedx
961c196219 Change django-oauth-plus to use Github repo for Django 1.11 compat 2017-10-02 13:53:26 -04:00
Matt Tuchfarber
9de5cbea12 Bump enterprise to 0.48.2 2017-10-02 13:40:31 -04:00
Brian Mesick
72c5d952db Merge pull request #16132 from edx/bmedx/upgrade_djpyfs_PLAT-1743 
Upgrade django-pyfs to 1.0.7
 2017-10-02 13:23:04 -04:00
John Eskew
9987c42022 Merge pull request #16039 from edx/jeskew/paver_calls_tox_to_run_pytest 
Paver changes to run tox testing for system & lib tests.
 2017-10-02 08:39:23 -04:00
Uzair Rasheed
0241081842 Merge pull request #16123 from edx/LEARNER-2620/remove-fb-sdk 
Remove fb-sdk from base.txt requirements
 2017-09-30 13:35:51 +05:00
bmedx
0f411e9880 Upgrade django-pyfs to 1.0.7 2017-09-29 11:46:58 -04:00
John Eskew
0ee412831f Include paver in tox env - a few tests use it. 2017-09-29 10:39:51 -04:00
John Eskew
ade766a5e2 Add tox to testing requirements. 2017-09-29 10:39:51 -04:00
Noraiz Anwar
bfe2b67eae Merge pull request #16115 from edx/noraiz/update-edx-proctoring 
update edx-proctoring to 1.2.2
 2017-09-29 13:04:54 +05:00
uzairr
09e17022af Remove fb-sdk from base.txt requirements 
Facebook wants from edX to upgrade all graphAPI calls to v2.9,
after investigation it can be seen that edX-platform is accessing
graphAPI through python-social-auth package that is already accessing
v2.9.'base.txt' of the requirements has fb-sdk package that is also used
to access graphAPI,but currently, there is no area in our code that is
using this library that's why there is no need of it in requirements.

LEARNER-2620
 2017-09-28 19:36:06 +05:00
John Eskew
b7fc838d6f Upgrade lxml in its other versioned requirement location. 2017-09-27 12:09:24 -04:00
noraiz-anwar
f644593655 update edx-proctoring to 1.2.2 2017-09-27 18:03:54 +05:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1 
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
 2017-09-27 00:16:34 +05:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
Gabe Mulley
a2dc27e6b1 fix multi-course emails and update ACE 2017-09-25 14:07:08 -04:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
617085b5d1 Move psutil req from paver to base - used in non-test code. 2017-09-25 10:33:15 -04:00
John Eskew
2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. 2017-09-25 10:33:14 -04:00
John Eskew
9d93c75089 Remove unused EASE requirement. 2017-09-25 10:33:14 -04:00
John Eskew
8eb5945e39 Move Django requirement into separate file to enable tox testing. 2017-09-25 10:33:14 -04:00
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