ayub-khan
bfff2da76f
-Updated django-wiki to v0.0.19
2018-07-09 19:23:57 +05:00
Brittney Exline
b851335573
ENT-1074 Upgrade edx-enterprise version to 0.70.5
2018-07-06 13:14:19 -04:00
ayub-khan
258ac1d29b
updated edx-ora and i18n-tools version
2018-07-06 10:58:59 +05:00
Kevin Falcone
6c181bde71
Get a management command bugfix in from oauth2-provider 1.3.3
2018-07-03 16:31:19 -04:00
zubair-arbi
66937b2cdf
ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog
2018-07-03 17:09:56 +05:00
Feanil Patel
48774a7383
Pin pylint-plugin-utils until we move to python 3.
...
the plugin has abandonned support for python 2 so functionality is not
guaranteed in future upgrades.
2018-07-02 16:35:10 -04:00
Feanil Patel
1d8319c779
Upgrade to the latest Django 1.11 + make upgrade
...
Django 1.11 Changelog - https://docs.djangoproject.com/en/2.0/releases/1.11.14/
2018-07-02 13:55:19 -04:00
zubair-arbi
bbdcf6de7a
ENT-1052 discount by enterprise catalog
2018-06-29 16:04:06 +05:00
Nimisha Asthagiri
522349c502
Upgrade edx-drf-extensions and add rest_condition
2018-06-28 18:37:52 -04:00
Calen Pennington
b85d6f031c
Merge pull request #18417 from cpennington/cale/fix-ora-webpack
...
Cale/fix ora webpack
2018-06-28 12:47:53 -04:00
Qubad786
c444a51af8
Resolve transcript migrations issues resulted from running it on stage
2018-06-28 18:47:40 +05:00
Mushtaq Ali
dc698608d2
Enterprise version bump to 0.70.1
2018-06-28 12:07:57 +05:00
Calen Pennington
07a15c681f
Reapply the XBlock RequireJS -> Webpack changes
...
This reverts commit 105db2cf59 , reversing
changes made to 447457594f .
2018-06-27 22:27:07 -04:00
Jeremy Bowman
e80152fd8a
TE-2584 Upgrade XBlock to fix edx-sga warning
2018-06-27 10:16:51 -04:00
Brittney Exline
3d30a44241
ENT-1007 Upgrade edx-enterprise to 0.70.0
2018-06-26 16:26:46 -04:00
Squirrel18
48e6ce6336
add python-modernize to development dependencies file.
2018-06-25 16:56:13 -05:00
Usman Khalid
8b1aad080a
Add complete on view support to render_xblock view.
2018-06-22 14:46:03 -04:00
Robert Raposa
30b1ff0f5d
Upgrade dependencies.
2018-06-20 17:48:41 -04:00
Douglas Hall
bab6e3669c
Add new custom DOT Application model to support OAuth2 per-application scopes.
...
This also introduces a model for persisting organization-based filters on
a per-application basis. See openedx/core/djangoapps/oauth_dispatch/docs/decisions/0007-include-organizations-in-tokens.rst
for additional details.
2018-06-20 16:31:19 -04:00
muhammad-ammar
29cf5be9db
update enterprise version
2018-06-20 16:35:26 +05:00
Eric Fischer
e72549cdbe
Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering"
...
This reverts commit 9a70ca78a5 , reversing
changes made to efd5b9abbd .
Hopefully fixes EDUCATOR-3053
2018-06-15 13:18:27 -04:00
Feanil Patel
c96bc8330c
Merge pull request #18363 from edx/feanil/update_social_auth
...
Actually update social auth packages.
2018-06-13 22:25:03 -04:00
Feanil Patel
9e3ab9909f
Actually update social auth packages.
2018-06-13 17:24:33 -04:00
Calen Pennington
9a70ca78a5
Merge pull request #18340 from cpennington/fix-studio-xblock-rendering
...
Fix studio xblock failing renders (due to asset hashing loop)
2018-06-13 15:58:34 -04:00
Feanil Patel
d9c0d1cb7f
Don't upgrade py2neo to 4.0.0
...
It seems to have broken tests.
2018-06-12 12:28:55 -04:00
Feanil Patel
7290cad5b7
Run make upgrade after unpinning the social auth packages.
2018-06-12 11:27:44 -04:00
Tasawer Nawaz
79e429d5cd
Update facebook integration
...
LEARNER-4819
2018-06-12 11:19:39 -04:00
Stuart Young
bfd2f1c8f8
add script to detect dead code
2018-06-08 14:53:17 -04:00
John Eskew
6a268e0d76
Bump poll xblock version to 1.5.1 - removes warning.
2018-06-08 11:00:45 -05:00
asadiqbal
6734dcab33
version bump 0.69.1
2018-06-08 10:10:51 -04:00
Calen Pennington
be3c7e05c5
Reapply "Switch container factory to webpack"
...
This reverts commit 18d93b00ba .
2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba
Revert "Switch container factory to webpack"
2018-06-07 13:46:47 -04:00
Calen Pennington
0abe75a7c6
Re-apply the changes to convert XBlocks to Webpack
...
Reapplies edx/edx-platform#17509
This reverts commit 0f7e2373d0 .
2018-06-06 12:52:12 -04:00
Eric Fischer
a09494bc3c
Merge pull request #18323 from edx/efischer/ora_update
...
Upgrade edx-ora2 to 2.1.17
2018-06-06 11:37:45 -04:00
Eric Fischer
47690173e3
Upgrade edx-ora2 to 2.1.17
2018-06-06 11:07:02 -04:00
Michael Youngstrom
26b4e30833
Remove django 1.8 shim
2018-06-06 10:34:56 -04:00
Uman Shahzad
68a2d18d67
Bump edX Enterprise to 0.69.0.
2018-05-31 23:40:55 +05:00
Uman Shahzad
7d03b9cc73
Bump edx-enterprise to 0.68.8.
2018-05-30 19:35:32 +05:00
Zia Fazal
b74cbfb85a
Merge pull request #18255 from edx/ziafazal/WL-1388
...
WL-1388: Added a base MessageType for ace
2018-05-30 11:14:04 +05:00
Calen Pennington
0f7e2373d0
Revert "Switch container factory to webpack"
2018-05-29 16:01:38 -04:00
Calen Pennington
56759b196f
Upgrade django-webpack-loader (and other recent minor updates)
2018-05-29 12:39:28 -04:00
Qubad786
3d01a5b24a
bump VAL
2018-05-25 21:29:26 +05:00
Qubad786
f9476ab4ff
Update old transcripts metadata present in video xml with the new transcripts for backward compatibility.
2018-05-25 21:29:26 +05:00
Zia Fazal
f2ea2ca360
Added a base MessageType for ace
...
added unit tests
updated edx-ace version
fixed quality violations
Fixed quality violations
Changed ACEMessageType to BaseMessageType
2018-05-25 10:52:33 +05:00
Feanil Patel
9f6ac8a3af
Run make upgrade.
2018-05-23 10:35:03 -04:00
Feanil Patel
0872d2b591
Move off of our fork onto a published fork of the rfc6266.
...
The published fork seems to be getting updates more regularly than the original project
and has the bugfix we forked for.
2018-05-23 09:28:03 -04:00
Uman Shahzad
244576bcb3
Update edx-enterprise to 0.68.6.
2018-05-22 13:41:58 +05:00
J Eskew
572b8a0be4
Merge pull request #17670 from open-craft/MCKIN-7023-xblock-i18n-templates
...
[MCKIN-7023] Improve XBlock i18n by allowing template translations
2018-05-21 13:49:13 -04:00
Omar Al-Ithawi
73af914cfc
Use edx-ace for password reset email
2018-05-21 09:49:14 -04:00
Jeremy Bowman
8d4a2e2be9
Upgrades to avoid sure install bug
2018-05-18 15:14:29 -04:00