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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-pipeline-bot
112a3d1bba Merge pull request #19228 from edx/release-mergeback-to-master 
Merge release back to master
 2018-11-06 09:40:47 -05:00
Douglas Hall
f4df64ef26 Merge pull request #19224 from edx/douglashall/fix_login_redirect_whitelist 
Add LOGIN_REDIRECT_WHITELIST setting to production settings.
 2018-11-05 15:18:16 -05:00
Douglas Hall
726b28d4fa Add LOGIN_REDIRECT_WHITELIST setting to production settings. 2018-11-05 14:31:56 -05:00
Farhanah Sheets
44f10be03c Unicode developer_message to handle Spanish failures 2018-11-05 14:00:07 -05:00
Calen Pennington
6c5ee7209c Merge pull request #19108 from cpennington/stacked-configuration-models 
Stacked configuration models
 2018-11-05 13:43:25 -05:00
Douglas Hall
82133433c5 Merge pull request #19211 from edx/douglashall/corsheaders_allow_methods 
Allow custom USE-JWT-COOKIE header on cross origin requests.
 2018-11-05 11:33:41 -05:00
Douglas Hall
0f125c7a62 Allow custom USE-JWT-COOKIE header on cross origin requests. 2018-11-05 10:56:22 -05:00
Ahsan Ul Haq
e04d1a7197 Merge pull request #19197 from edx/ahsan/LEARNER-6612-learner-profile-textarea-char-count 
About Me textarea character counter accessibility issue
 2018-11-05 20:02:25 +05:00
Ahsan Ulhaq
0c00416deb About Me textarea character counter accessibility issue 
LEARNER-6612
 2018-11-05 19:11:18 +05:00
Ned Batchelder
63b43ce4e4 Merge pull request #19072 from shadinaif/fix_lazy_text_with_json_dumps 
Fix exceptions raised when a lazy text is used in json dump
 2018-11-05 06:20:05 -05:00
Shadi Naif
4df2073376 Fix exceptions raised when a lazy text is used in json dump 2018-11-05 12:24:45 +02:00
jerry
a104eb8e8c fix: closed caption can't move when mutiplevideos in one page 2018-11-05 11:00:15 +08:00
edX Transifex Bot
c24185ec98 Update translations 2018-11-04 16:18:06 -05:00
Nimisha Asthagiri
ab9587dce8 Merge pull request #19058 from stvstnfrd/kill/image-modal/deprecate-upstream 
Deprecate ImageModal HtmlModule
 2018-11-04 10:09:00 -05:00
Ned Batchelder
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Josh McLaughlin
7ad589f6ad Put certificate data message into it's own block for overriding 2018-11-03 00:06:28 -07:00
Calen Pennington
e1ebb8fe71 Use -v during pip-compiles to get more useful debug information in the case of failures 2018-11-02 15:36:01 -04:00
Calen Pennington
8901bf4482 Add a facility for building stacked configuration models that control the same configuration on a Global, Site, Org and Course level 2018-11-02 15:36:01 -04:00
Ned Batchelder
c0e2fd676a Merge pull request #19175 from edx/nedbat/update-edx-lint 
Use latest edx-lint
 2018-11-02 15:18:58 -04:00
Ned Batchelder
6aed72823f Merge pull request #19209 from edx/nedbat/trim-trailing-comma 
Remove a mistaken trailing comma
 2018-11-02 11:39:38 -04:00
Ned Batchelder
083a8d3a52 We've re-enabled some warnings, so have to raise the limit 2018-11-02 11:06:59 -04:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Ned Batchelder
59d78031d8 Fix trailing-comma-tuple warnings 2018-11-02 11:06:59 -04:00
Ned Batchelder
d0d904a2cc make upgrade 2018-11-02 11:06:59 -04:00
Ned Batchelder
9fc2e9b000 Merge pull request #19208 from edx/nedbat/fix-pycodestyle 
Fix pycodestyle violations
 2018-11-02 10:06:04 -04:00
Jeremy Bowman
31e6a04a83 Merge pull request #19203 from edx/jmbowman/TE-2802 
TE-2802 Make notes visibility toggling tests more reliable
 2018-11-02 09:52:27 -04:00
Saleem Latif
fcbe06a434 Merge pull request #19207 from edx/saleem-latif/ENT-1294 
ENT-1294: edx-enterprise version upgrade to 1.0.3
 2018-11-02 15:45:45 +05:00
Ned Batchelder
6f0b007ae3 Remove a mistaken trailing comma 2018-11-02 06:19:45 -04:00
Ned Batchelder
fae196a89b Don't use async as an identifier 2018-11-02 06:10:13 -04:00
Ned Batchelder
2d438d8bb5 Fix 'W605 invalid escape sequence' errors from pycodestyle 2018-11-02 06:06:43 -04:00
Saleem Latif
62051750f9 edx-enterprise version upgrade to 1.0.3 2018-11-02 12:45:17 +05:00
Simon Chen
428c061b07 Merge pull request #19200 from edx/schen/gradebook-no-auto-grade 
Remove auto grade column from override modal
 2018-11-01 16:14:58 -04:00
Bessie Steinberg
062b90c9ec Merge pull request #19204 from cpennington/fix-reve-68 
Don't add the ContentGatingPartition to group_access in content_type_…
 2018-11-01 15:55:14 -04:00
Brian Beggs
ab0326c9c7 Merge pull request #19199 from edx/bbeggs/ungdpr-password-reset 
Reset learners password when user is unGDPRed/unretired via django admin
 2018-11-01 15:45:27 -04:00
Simon Chen
34fd4a65f0 Remove auto grade column from override modal 2018-11-01 15:37:06 -04:00
Alex Dusenbery
53b60607d6 Gradebook data: generate a label attribute if none exists (like for ungraded content). 2018-11-01 15:31:48 -04:00
Calen Pennington
76859f04a8 Don't add the ContentGatingPartition to group_access in content_type_gating.field_overrides if the waffle flag is off 2018-11-01 15:20:15 -04:00
Brian Beggs
49015e6d1a Reset learners password when user is unGDPRed/unretired via django admin. 2018-11-01 15:09:36 -04:00
Jeremy Bowman
11c2185d90 TE-2802 Make notes visibility toggling tests more reliable 2018-11-01 14:57:38 -04:00
Bill Filler
026d574576 mobile-api changes to support gated-content 
Change behavior of existing v0.5 mobile api /api/mobile/v0.5/users/{username}/course_enrollments/ to exclude expired courses due to audit duration limits from the result set.
Add v1 version of mobile api /api/mobile/v1/users/{username}/course_enrollments/ that returns all enrollments and includes a field audiit_access_expires that contains expiration date (or null).

REV-495
 2018-11-01 10:13:52 -04:00
Jeremy Bowman
b14d9b4813 Merge pull request #19063 from open-craft/jazzar/bleach-upgrade 
Upgrade bleach to 2.1.4
 2018-11-01 09:47:39 -04:00
AsadAzam
1f19cbe76a Merge pull request #19191 from edx/asad/educator-3660-add-logs 
Add time logs
 2018-11-01 16:51:27 +05:00
asadazam93
3b5e0eb5c0 Add time logs 2018-11-01 15:43:13 +05:00
Ahmed Jazzar
abb33ce56d Upgrade requirements 2018-10-31 14:12:31 -07:00
Feanil Patel
f323ab00ed Merge pull request #19194 from edx/feanil/revert_gunicorn_upgrade 
Revert "upgrade gunicorn 19.0 and make upgrade"
 2018-10-31 16:37:59 -04:00
Alex Dusenbery
99705e54a6 Remove GenericAPIView subclass from grades API views; add a test that /api-docs/ works. 2018-10-31 16:10:31 -04:00
Ahmed Jazzar
b16b4eb4e7 Upgrade bleach to 2.1.4 
Update ORA2 repo version

Fix Python tests

Upgrade Recommender XBlock version

Remove unnecessary requirements and update bleacher usage

Keep html5lib unpinned

Upgrading requirements

Ignore python-interpolate-html for bleached html
 2018-10-31 12:24:22 -07:00
Michael Youngstrom
2fc129fcda Merge pull request #19192 from edx/youngstrom/fix-rate-and-max-errors 
Fix ratelimiting issue and account for other ecs failures
 2018-10-31 15:06:48 -04:00
Feanil Patel
4e13a1c2dd Revert "upgrade gunicorn 19.0 and make upgrade" 
This reverts commit f6c215ae5b.
 2018-10-31 15:01:00 -04:00
Bessie Steinberg
2aa3129adc Merge pull request #19166 from edx/rev/content-gating-waffle 
Rev/content gating waffle
 2018-10-31 14:50:15 -04:00