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
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
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
asadiqbal
2d037d3dc7
version bump enterprise
2018-05-18 14:06:23 +05:00
Feanil Patel
e718ab0260
Upgrade using pip-tools.
2018-05-16 14:50:16 -04:00
Sanford Student
b89eba07e2
upgrade django-wiki
2018-05-16 13:26:03 -04:00
asadiqbal
b153b9e8f6
enterprise version bump
2018-05-15 18:59:19 +05:00
Jillian Vogel
841a68c808
Improves XBlock i18n by allowing template translations
...
Bumps xblock-utils to v1.1.1
Bumps xblock-drag-and-drop-v2 to v2.1.6
2018-05-15 09:37:53 +09:30
Gabe Mulley
5fa6c51368
Revert "Use edx-ace for the password reset email"
2018-05-10 13:06:52 -04:00
Michael Youngstrom
4bc417dcd0
Merge pull request #18171 from edx/youngstrom/bump-lettuce
...
Upgrade lettuce fork
2018-05-10 11:31:59 -04:00
Gabe Mulley
7a5cecf3e9
Merge pull request #16545 from appsembler/omar/fmo/multipart-email
...
Use edx-ace for the password reset email
2018-05-10 11:31:43 -04:00
Michael Youngstrom
20d0626cb5
Upgrade lettuce and other dependencies
2018-05-10 09:48:00 -04:00
Uman Shahzad
251454d846
Update requirements.
2018-05-10 13:52:46 +05:00
Douglas Hall
c6ec5edbf7
Add API documentation with django-rest-swagger.
2018-05-08 14:38:33 -04:00
Omar Al-Ithawi
3a64dad8cf
Upgrade requirements to use edx-ace==0.1.7
2018-05-08 19:18:37 +03:00
Alex Dusenbery
0b11634e4c
Run make upgrade to get latest version of xblock-lti-consumer (and others).
2018-05-07 13:35:30 -04:00
Mushtaq Ali
f4b1da1f42
Merge pull request #17718 from edx/transcripts-phase-2
...
Transcripts phase 2
2018-05-07 12:42:50 +05:00
Mushtaq Ali
923897d015
VAL version bump
2018-05-04 15:52:53 +05:00
Michael Terry
f8b009fecc
Fix extracting i18n from jsx code
...
React code (in jsx files) was not being extracted at all. Fixed this
by updating to edx-i18n-tools 0.4.5.
Also, template literals (feature of es2015) don't work well with
gettext at all. So convert those instances to HtmlUtils or
StringUtils interpolation calls.
FEDX-505
2018-05-02 15:21:45 -04:00
John Eskew
53502a6395
Upgrade Django to 1.11.13
2018-05-02 10:36:33 -04:00
Jeremy Bowman
9477ad23d1
TE-2528 Upgrade testing dependencies
2018-04-25 16:37:29 -04:00