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

1833 Commits

Author SHA1 Message Date
Calen Pennington
eff9c9c9ab Move common attributes into Resolver.__init__ 2017-10-24 10:15:36 -04:00
zubair-arbi
dc20549c6d bump enterprise version from 0.52.4 to 0.52.10 
ENT-675
 2017-10-23 19:49:58 +05:00
John Eskew
5c03f6554d Upgrade django-simple-history and edx-enterprise together. 2017-10-20 11:42:08 -04:00
Brittney Exline
23640d0019 ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET 2017-10-19 12:24:05 -04:00
Uman Shahzad
80084bb295 Bump edx-enterprise to 0.52.2. 2017-10-18 16:09:11 +05:00
Uman Shahzad
4055cc00cc Bump edx-enterprise to 0.52.1. 2017-10-18 00:50:00 +05:00
Muzaffar yousaf
b34b5d9a12 Merge pull request #15872 from edx/video-transcript-preferences 
Video transcript preferences
 2017-10-17 14:45:29 +05:00
edx-pipeline-bot
c011e7134d Merge pull request #16243 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-16 14:14:37 -04:00
Gabe Mulley
4a13f9bf53 ACE writes to a file by default 2017-10-16 12:17:25 -04:00
muzaffaryousaf
d4147e7d37 Update edx-val dependency. 2017-10-16 19:23:39 +05:00
John Eskew
1f36bf0876 Add django-simple-history back to edx-platform as a requirement. 
The module is still used by (at least) edx-enterprise.
 2017-10-16 09:42:22 -04:00
Douglas Hall
6387e3a813 Merge pull request #16225 from edx/asadiqbal08/ENT-694 
Enterprise- Version bumped to 0.51.5
 2017-10-16 09:17:43 -04:00
asadiqbal
c5be291e6f Version bumped 2017-10-13 11:31:07 +05:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Waheed Ahmed
0702df51bf Merge pull request #16114 from edx/waheed/LEARNER-2320-upgrade-edx-organizations-version 
Upgrading the edx-organizations package to 0.4.7.
 2017-10-11 20:20:14 +05:00
Waheed Ahmed
5cb908991f Upgrading the edx-organizations package to 0.4.7. 
Added explicit 'fields' attribute to OrganizationSerializer. Creating a
ModelSerializer without either the 'fields' attribute or the 'exclude'
attribute has been deprecated since 3.3.0.

LEARNER-2320
 2017-10-11 18:03:00 +05:00
Douglas Hall
ca903278f5 Updating edx-enterprise to 0.51.2. 
https://github.com/edx/edx-enterprise/compare/0.51.0...0.51.2
 2017-10-11 08:47:50 -04:00
Uman Shahzad
7516453c14 Bump to 0.51.1. 2017-10-11 02:05:04 +05:00
Bill Filler
dd16bf7685 bump edx-enterprise version to 0.51.0 2017-10-05 17:14:28 -04:00
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