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

46417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
Bill DeRusha
890f7c5a5e Merge pull request #18311 from edx/bderusha/pw-rollout-copy-change 
Update copy for password compliance message to be more clear.
 2018-06-06 09:12:01 -04:00
Waheed Ahmed
23d1beedf7 Merge pull request #18285 from edx/waheed/LEARNER-4520-fix-pdf-certificates 
Fix PDF cert gereration/regeneration and URLs.
 2018-06-06 15:36:52 +05:00
Bill DeRusha
40b46d04c1 Update copy for password compliance message to be more clear. 2018-06-05 16:26:57 -04:00
Brian Beggs
4d75ed3381 Merge pull request #15940 from open-craft/upstream-call-xblock-handler-with-oauth 
OAuth2 API to call XBlock handlers
 2018-06-05 16:13:09 -04:00
Eric Fischer
bea86a673a Merge pull request #18313 from edx/hack_xix/PLAT-1397 
s/django.core.urlresolvers/django.urls/g
 2018-06-05 15:32:31 -04:00
Chandrakant Gopalan
a3df96bf1c OAuth2 API to call XBlock handlers 2018-06-05 15:12:31 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Jeremy Bowman
1765c99a5a Merge pull request #18310 from edx/jmbowman/TE-2543 
TE-2543 Add tox env for Python 3.5
 2018-06-04 14:06:47 -04:00
Jeremy Bowman
08a38fb858 TE-2543 Add tox env for Python 3.5 2018-06-04 13:27:14 -04:00
Tyler Hallada
4762f7ce18 Merge pull request #18309 from edx/thallada/fix-edit-image-scroll 
Allow scrolling after insert/edit image in Studio
 2018-06-04 13:25:46 -04:00
Tyler Hallada
6e7f478402 Allow scrolling after insert/edit image in Studio 
The scroll lock class `modal-open` is removed from the body when the
EditImageModal is closed using the "Close" or "X" button, but not when the
"Insert Image" button is clicked. The submit button handler now calls the
`closeImageModal` handler too so that the `modal-open` class is removed after
inserting or editing an image.
 2018-06-04 12:31:04 -04:00
Cole Rogers
2ac2c045e3 Merge pull request #18296 from edx/colelrogers/remove-GDPR-flag 
Removed GDPR flags and usages WIP
 2018-06-04 11:56:13 -04:00
Cole Rogers
3df12010f1 Merge pull request #18306 from edx/colelrogers/remove_bokchoy_test 
Removed student entrance test
 2018-06-04 11:54:36 -04:00
Cole Rogers
41bb144854 Removed student entrance test 2018-06-04 10:29:01 -04:00
Cole Rogers
623cb0d6ae Removed GDPR flag and its functionality 2018-06-04 10:25:37 -04:00
Asad Iqbal
1a4ef62f15 Merge pull request #18256 from edx/asadiqbal08/ENT-692 
[ENT-692] Change the log level from Warning to Info
 2018-06-04 11:00:52 +05:00
Zia Fazal
66c7159cf6 Merge pull request #17362 from caesar2164/allow-about-sidebar-content-from-instructor 
Add custom HTML to Course About page sidebar
 2018-06-04 09:41:52 +05:00
Marco Morales
3f70a07527 Merge pull request #18189 from caesar2164/center-password-reset-upstream 
Centers all login-register forms
 2018-06-01 16:28:48 -04:00
Michael Youngstrom
2427f77a5e Merge pull request #18301 from edx/testeng/bokchoy_auto_cache_update_265b7b3e8e281d3a61011363327d949cbcd150d4 
Bokchoy db cache update
 2018-06-01 15:55:14 -04:00
Farhanah Sheets
0bb23a2405 Merge pull request #18304 from edx/fsheets/sfe-version-bump 
Upgrade studio-frontend to latest v1.10.5
 2018-06-01 14:56:17 -04:00
Troy Sankey
225b3e62ad Merge pull request #18305 from edx/pwnage101/edxnotes-retirement-use-anon-id 
use anonymous user ID when calling the edxnotes retirement endpoint
 2018-06-01 14:36:25 -04:00
edx-cache-uploader-bot
8cdcc18456 Updating migrations 2018-06-01 14:34:46 -04:00
Giulio Gratta
56ac149962 Add custom HTML to Course About page sidebar 
This allows course staff to add arbitrary HTML to the sidebar on the About page.

A waffle switch has been added in the course_experience app to allow enabling and disabling of this feature.
 2018-06-01 14:26:05 -04:00
Farhanah Sheets
e0f3d2b200 Upgrade studio-frontend to latest v1.10.5 2018-06-01 14:14:29 -04:00
Troy Sankey
5227b4ee7b use anonymous user ID when calling the edxnotes retirement endpoint 2018-06-01 13:26:37 -04:00
Michael Terry
27a2b8f676 Only get program certs from credentials 
Allow our utility function to filter out course certs when asking
Credentials for a list of certificates. This way once we start
handing back course certs, the LMS won't be surprised by
assumptions about what the credentials service will give back.
 2018-06-01 12:53:18 -04:00
Troy Sankey
c524acc3ed Merge pull request #18300 from edx/pwnage101/retirement-endpoint-should-allow-trailing-slash 
Notes retirement endpoint should require trailing slash
 2018-06-01 11:48:55 -04:00
Troy Sankey
d33cf1d231 Notes retirement endpoint should require trailing slash 
This is because we already require trailing slashes on most of the rest
of the retirement endpoints, which are called via slumber which appends
the trailing slash by default.
 2018-06-01 11:10:45 -04:00
Diana Huang
597d65f142 Merge pull request #18277 from edx/diana/notification-email 
LEARNER-5039: Add new notification email.
 2018-06-01 10:43:32 -04:00
Uman Shahzad
5f2288c46f Merge pull request #18299 from edx/uman/ent-0.69.0 
[ENT-979] Bump edX Enterprise to 0.69.0.
 2018-06-01 14:10:29 +05:00
Diana Huang
8adcff938a Add new notification email. 2018-05-31 16:05:32 -04:00
Diana Huang
8da0153433 Merge pull request #18298 from edx/diana/hide-button-white-label 
LEARNER-5434: Add a configuration option for deleting student accounts.
 2018-05-31 15:23:50 -04:00
Uman Shahzad
68a2d18d67 Bump edX Enterprise to 0.69.0. 2018-05-31 23:40:55 +05:00
Diana Huang
65f0f6809d Add a configuration option for deleting student accounts. 2018-05-31 14:29:00 -04:00
Michael Youngstrom
58d059a15b Merge pull request #18293 from edx/testeng/bokchoy_auto_cache_update_34ca93e04553b114b9de1142b6a1a4cd7e2c2ceb 
Bokchoy db cache update
 2018-05-31 10:54:28 -04:00
asadiqbal
30db538e3a Change the log level to info 2018-05-31 19:43:11 +05:00
edx-cache-uploader-bot
dddb4a9548 Updating migrations 2018-05-31 09:58:57 -04:00
Waheed Ahmed
baf3e594be Fix PDF cert gereration/regeneration and URLs. 
Since cert_html_view_enabled is deprecated and set default true,
PDF certificates are not appearing for learners and staff also
unable to regenerate them.

LEARNER-4520
 2018-05-31 15:45:31 +05:00
Ahsan Ul Haq
783aca5559 Merge pull request #17042 from raccoongang/dgamanenko/fix_username_missing_field 
Fix "admin/auth/user/add "username" missing field.
 2018-05-31 14:22:36 +05:00
Waheed Ahmed
35d60959e2 Merge pull request #18291 from edx/waheed/LEARNER-5373-fix-credentials-cache-key 
Add program UUID in cache key instead passing as resource id.
 2018-05-31 02:22:04 +05:00
Uman Shahzad
8b68afa03a Merge pull request #18284 from edx/uman/ent-0.68.8 
[ENT-863] Bump edx-enterprise to 0.68.8.
 2018-05-31 01:23:38 +05:00
Waheed Ahmed
bc358b89de Add program UUID in cache key instead passing as resource id. 
LEARNER-5373
 2018-05-31 01:22:17 +05:00
Troy Sankey
172b1c8c09 Merge pull request #18268 from edx/pwnage101/edxnotes_retirement_endpoint 
Add API endpoint for retiring a user from EdxNotes (edx-notes-api)
 2018-05-30 14:17:09 -04:00
Stu Young
6f20eff83f Merge pull request #18287 from edx/testeng/bokchoy_auto_cache_update_51c0d1d754ff731cf41ff7190a64d244acc418c9 
Bokchoy db cache update
 2018-05-30 13:12:25 -04:00
Troy Sankey
b2f4762dc4 Add API endpoint for retiring a user from EdxNotes (edx-notes-api) 
This also creates an appropriate course-agnostic location for notes
APIs, under /api/edxnotes/v1/.
 2018-05-30 12:46:07 -04:00
edx-cache-uploader-bot
882564b215 Updating migrations 2018-05-30 12:14:53 -04:00
Matthew Piatetsky
e9a153c5e6 Merge pull request #18279 from edx/add_email_to_metadata 
add user email to metadata
 2018-05-30 11:50:15 -04:00
Feanil Patel
6ac803ed6e Merge pull request #18275 from edx/feanil/drop_moar_indices 
Feanil/drop moar indices
 2018-05-30 11:26:31 -04:00
Uman Shahzad
7d03b9cc73 Bump edx-enterprise to 0.68.8. 2018-05-30 19:35:32 +05:00