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

2121 Commits

Author SHA1 Message Date
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
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
Alex Dusenbery
9456bcdcce EDUCATOR-2516 | Bump xblock-lti-consumer to 1.1.8 2018-05-04 16:43:17 -04: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
Ned Batchelder
c346b6423e Merge pull request #17748 from open-craft/jill/swift_content_length_from_fd_master 
Set SWIFT_CONTENT_LENGTH_FROM_FD=False
 2018-04-26 17:03:31 -04:00
Jeremy Bowman
9477ad23d1 TE-2528 Upgrade testing dependencies 2018-04-25 16:37:29 -04:00
Jeremy Bowman
42fef9d38d Merge pull request #18025 from edx/jmbowman/TE-2546 
TE-2546 Remove obsolete requirements files
 2018-04-24 11:54:48 -04:00
asadiqbal
720ae822a5 version bump 2018-04-24 16:42:39 +05:00
Jeremy Bowman
086e98449e TE-2546 Remove obsolete requirements files 2018-04-23 13:40:19 -04:00
Uman Shahzad
87919f4d53 Add Enterprise middleware that injects customer data. 2018-04-21 08:14:52 +05:00
Jeremy Bowman
1f3f0e2fb9 TE-2547 Add dependency analysis scripts 2018-04-19 13:48:08 -04:00
Jeremy Bowman
28d291dce7 TE-2527 Move test and dev dependencies out of base.in 2018-04-18 14:44:31 -04:00
Nimisha Asthagiri
0f29ca2620 Merge pull request #17968 from edx/arch/remove-course-structure-usage-in-completion 
Remove Completion's usage of Course Structures API
 2018-04-18 08:03:25 -04:00
Hasnain
3fca1af171 WL-1518 | Get decline notification context from enterprise. 2018-04-18 15:00:47 +05:00
Nimisha Asthagiri
fd078ae1f5 Remove Completion's usage of Course Structures API 2018-04-17 21:13:39 -04:00
Mushtaq Ali
d6e3474ad7 VAL version bump 2018-04-17 12:52:31 +05:00
Mushtaq Ali
7242172e6e VAL version bump 2018-04-15 23:45:44 +05:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Jeremy Bowman
7b0f3195e0 Remove merge conflict cruft from github.txt 2018-04-13 11:33:40 -04:00
Jeremy Bowman
9ca9aa44c6 PLAT-2060 Use pip-tools to manage requirements files (take 2) 
This reverts commit a7fa0c211d.
 2018-04-12 17:22:48 -04:00
Bill Filler
55a8ce2171 bump ora2 release to 2.1.15 to fix EDUCATOR-2634 2018-04-12 14:13:31 -04:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
Feanil Patel
0177585f30 Move to the latest python newrelic agent. 2018-04-09 13:33:50 -04:00
Feanil Patel
c5b0a104d6 Merge pull request #17772 from edx/feanil/cleanup_pre 
Feanil/cleanup pre
 2018-04-09 13:17:26 -04:00
Gregory Martin
62775c891a Delete visual_progress_enabled waffle flag. 
https://openedx.atlassian.net/browse/EDUCATOR-2333
 2018-04-06 15:07:16 -04:00
Feanil Patel
ba130c87e3 Merge pull request #17896 from edx/feanil/upgrade_newrelic 
Update to latest 2.x which includes a security fix.
 2018-04-06 13:07:29 -04:00
Douglas Hall
bb1044526b Merge pull request #17894 from edx/douglashall/updgrade_enterprise_0_67_3 
Upgrade edx-enterprise package to 0.67.3.
 2018-04-06 13:05:15 -04:00
Feanil Patel
24b85ab81d Update to latest 2.x which includes a security fix. 
Changelog: https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2018-04-06 10:47:26 -04:00
Douglas Hall
757657f53e Upgrade edx-enterprise package to 0.67.3. 
https://github.com/edx/edx-enterprise/compare/0.67.1...0.67.3
 2018-04-06 09:36:17 -04:00
Bill Filler
d80aa55cad bump version of edx-ora2 to 2.1.14 2018-04-05 18:39:06 -04:00