Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
50,702 Commits 1 Branch 0 Tags
7140948bb147bb131e11eba3d0bc2b2e393d808d
Commit Graph

50702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
7140948bb1 Merge pull request #20900 from open-craft/pooja/fix-username-hints-with-SSO 
SE-1199 Campus.il Fix unicode username hints with SSO
 2019-08-02 13:17:00 -04:00
David Ormsbee
358ba27a2a Merge pull request #21248 from open-craft/samuel/se-1155-fix-ccx-unicode 
SE-1155 [Campus.il] fix crashes on non-ascii in usernames for ccx enrollments
 2019-08-02 13:15:41 -04:00
Julia Eskew
a2dac21843 Add optional role parameter to course API endpoint. (#21059) 
* Add optional role parameter to course API endpoint.

* fixup! Add optional role parameter to course API endpoint.
 2019-08-02 12:52:30 -04:00
Christie Rice
bf414335cc REVMI-354 Add edit_bookmark permission (#21254) 2019-08-02 11:01:43 -04:00
Christie Rice
1c9904859b REVMI-354 Add view_xqa permission (#21255) 2019-08-02 11:01:21 -04:00
Hammad Ahmad Waqas
85c4ba1a9d Merge pull request #21283 from edx/hammad/bump-version 
edx-platform version bump
 2019-08-02 18:38:46 +05:00
Nimisha Asthagiri
d20f68b6e0 Merge pull request #21282 from edx/arch/depr-15-notes-token 
DEPR-15: Remove usage of firebase-token-generator
 2019-08-02 09:19:07 -04:00
Uzair Rasheed
0cd472005a Merge pull request #21277 from edx/PROD-399/update-mgmt-cmds-help-text 
Update Help msgs of management commands
 2019-08-02 17:59:15 +05:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Ayub
b876dce719 Merge pull request #21069 from edx/INCR-405 
INCR-405 python3 compatibility
 2019-08-02 15:15:06 +05:00
Hammad Ahmad Waqas
f8e89b5059 edx-platform version bump 2019-08-02 15:06:46 +05:00
Usama Sadiq
2484c3118e Merge pull request #21273 from edx/usama/learner-6735-help-center-language 
Spanish Help Center Page Update
 2019-08-02 15:06:29 +05:00
Ayub khan
4b2f68da84 INCR-405 python3 compatibility 2019-08-02 13:51:10 +05:00
usama sadiq
aa8003baeb Added check to exclude OpenEdx 
Added check to only apply the changes for
edx.org help center pages.
 2019-08-02 12:05:54 +05:00
pkulkark
076d82970c Fix unicode username hints with SSO 
Usernames containing unicode characters were
reportedly not showing up correctly in the
registration form when registered with MOE/SAML,
FB and Google.
This change fixes the issue by overriding the
django setting SOCIAL_AUTH_CLEAN_USERNAMES to
disable the default username check that wasn't
allowing non-ascii values.
 2019-08-02 09:53:42 +05:30
Samuel Walladge
54f9434d46 Allows unicode usernames to be used in CCX enrollments and reports. 
Previously, unicode would result in a UnicodeEncodeError as a result of
the format string being str instead of unicode.

Additionally, the log calls would crash with a traceback (while not
affecting the program flow).
 2019-08-02 08:50:15 +09:30
Nimisha Asthagiri
c1a5d2fa06 DEPR-15: Remove usage of firebase-token-generator 
The old Notes Django app is the only caller of this no longer
supported library. I have verified that this old app is no
longer functional and is already slated to be removed as part
of DEPR-18.

So this commit simply removes the call to firebase-token-generator
and leaves removal of the Notes app to DEPR-18.
 2019-08-01 18:56:04 -04:00
Dillon-Dumesnil
d5cfe35ece Merge pull request #21252 from edx/ddumesnil/disco-1222 
DISCO-1222: Allow switching course numbers for reruns
 2019-08-01 15:22:46 -04:00
Matthew Piatetsky
a4866d4163 [REVMI-354] add view_ccx_coach_dashboard permission (#21259) 
[REVMI-354] add view_ccx_coach_dashboard permission
 2019-08-01 15:17:53 -04:00
Michael Youngstrom
701ea97750 Add boto3 retry to xdist script (#21271) 2019-08-01 14:21:24 -04:00
Christie Rice
c146f82e84 REVMI-354 REVMI-356 Revert more masquerade code (#21278) 
* REVMI-354 REVMI-356 Revert more masquerade code

* Fix quality
 2019-08-01 13:17:52 -04:00
Matthew Piatetsky
628ae59682 add view_ccx_coach_dashboard permission 2019-08-01 12:41:47 -04:00
Christie Rice
a9ebf91c4d REVMI-354 Revert masquerade changes (#21276) 2019-08-01 12:05:59 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00
Matthew Piatetsky
6cc02f711d Merge pull request #21264 from edx/mpiatetsky_authz_5 
[REVMI-354] Add preview_certificates permission
 2019-08-01 09:48:39 -04:00
Christie Rice
0426446549 REVMI-354 Add view_courseware permission (#21237) 2019-08-01 09:12:48 -04:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
usama sadiq
825c02b4a2 Updated Spanish Language Code 
Changed Spanish language code from es to es-419
modified _build_help_center_url() to receive
selected language instead of default from settings.
 2019-08-01 13:24:30 +05:00
Usama Sadiq
c78db13de1 Merge pull request #21263 from edx/usama/learner-6735-help-center-language 
Updated Help Center Url
 2019-08-01 12:46:52 +05:00
usama sadiq
d83ec0f607 Updated Help Center Url 
Updated the generated url in the navigation
and footer based on the selected language of
the page.
 2019-08-01 12:12:06 +05:00
edx-transifex-bot
3e2e815f1a geoip2: update maxmind geolite country database (#21272) 2019-08-01 10:45:52 +05:00
Calen Pennington
b5a8f67e64 Merge pull request #21219 from cpennington/permission-courseware-enable-masquerade 
Permission courseware enable masquerade
 2019-07-31 14:15:28 -04:00
Feanil Patel
1694e21827 Merge pull request #21265 from edx/feanil/make_upgrade 
Run make upgrade.
 2019-07-31 14:07:36 -04:00
Matthew Piatetsky
17ef02e34f add preview_certificates permission 2019-07-31 13:39:16 -04:00
Feanil Patel
6e590ac9a8 Run make upgrade. 2019-07-31 13:19:26 -04:00
Feanil Patel
55d4b272b0 Merge pull request #21257 from edx/feanil/python3_changes 
Feanil/python3 changes
 2019-07-31 13:16:12 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
Feanil Patel
8564c6768c StringIO moved between python2 and python3. 
Grab it from six instead.
 2019-07-31 11:45:31 -04:00
Feanil Patel
b495a6babe NoneType not in types module in python3. 
Change our tests to use type(None) instead which works in both python2 and python3.
 2019-07-31 11:45:31 -04:00
Dillon Dumesnil
e5fbfb02c6 DISCO-1222: Allow switching course numbers for reruns 
Adds in tests for the new functionality while maintaining the old Validation Error message
 2019-07-31 10:42:09 -04:00
Uzair Rasheed
9076b5d31c Merge pull request #21261 from edx/revert-20001-master 
Revert "Support a URL address as FOOTER_ORGANIZATION_LOGO"
 2019-07-31 17:55:14 +05:00
Waheed Ahmed
77d4872bb3 Merge pull request #21262 from edx/waheed/PROD-499-fix-verify-image-aspect-ratio 
Fix photo ID verify images aspect ratio.
 2019-07-31 17:15:18 +05:00
Awais Jibran
6a7ddbb271 Merge pull request #21182 from edx/aj/fix-ltr-numaric-inputs 
Fix Numeric input problems are backwards for right-to-left languages
 2019-07-31 16:01:25 +05:00
Waheed Ahmed
05f758f1c1 Fix photo ID verify images aspect ratio. 
PROD-499
 2019-07-31 15:56:22 +05:00
Uzair Rasheed
01ebee0dca Revert "Support a URL address as FOOTER_ORGANIZATION_LOGO" 2019-07-31 15:25:11 +05:00
Syed Muhammad Dawoud Sheraz Ali
f56776dba8 Merge pull request #21180 from edx/dsheraz/educator-4521 
Update DnD Xblock
 2019-07-31 13:03:09 +05:00
Ayub
69b647ae08 Merge pull request #21104 from edx/INCR-432 
INCR-432 python3 compatibility
 2019-07-31 12:29:26 +05:00
DawoudSheraz
82874538e3 run make upgrade to update DnD Xblock version 2019-07-31 11:08:04 +05:00
Calen Pennington
1836cce9e3 Merge pull request #21253 from cpennington/coverage-combine-test-suite 
Archive all coverage reports, named by test context
 2019-07-30 15:18:59 -04:00
Calen Pennington
d0b160888b Archive all coverage reports, named by test context 2019-07-30 15:18:25 -04:00