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

50720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
70e2aaa95b EDUCATOR-4543 | Add utility functions to the catalog module that picks out all of the course_runs associated with a program, even those that live inside the curriculum of a sub-program. Use these functions to populate the course -> program index of the catalog/programs cache. Also some refactoring of a program_enrollments overview endpoint. 2019-08-05 11:30:19 -04:00
Calen Pennington
98f740f71a Merge pull request #21270 from cpennington/upload-correct-coverage-file 
Upload the coverage report from reports/${TEST_SUITE}.coverage
 2019-08-05 10:47:48 -04:00
Calen Pennington
0c01c6f056 Merge pull request #21285 from cpennington/masquerade-permission 
Switch courseware.masquerade_as_student over to using a StaffAccessRu…
 2019-08-05 10:46:58 -04:00
Aarif
54269f3dfa Merge pull request #21274 from edx/BOM-67 
BOM-67 Updated the dependencies for Django-Oauth-plus
 2019-08-05 19:34:24 +05:00
Waheed Ahmed
8b86a090a9 Merge pull request #21290 from edx/waheed/PROD-125-fix-course-org-link-rerun 
Fix course:org link creation upon rerun.
 2019-08-05 18:14:21 +05:00
Waheed Ahmed
23bc5af0fc Fix course:org link creation upon rerun. 
Upon rerun creation from publisher course:organization link
was not creating, due to which org logo was not appearing on
course certificates.

Fixed by creating course:org link upon rerun.

PROD-125
 2019-08-05 13:48:50 +05:00
aarif
a40c771a1c updated the github.in 
added the updated dependency for oauth2

added the commit hash instead of branch

minor fix

changes made by make upgrade
 2019-08-05 10:51:24 +05:00
Feanil Patel
2afc27741e Merge pull request #21266 from edx/feanil/moto_changes 
Upgrade moto to support python3.
 2019-08-02 15:07:43 -04:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
Calen Pennington
ff481bf748 Merge pull request #21287 from cpennington/test-admin-view 
Test the django admin view, and that it can be loaded
 2019-08-02 14:22:05 -04:00
Feanil Patel
9926fa0fbd Moto got better at checking permissions in their mock. 
Since we want anonymous read of these objects, we have to be explicit about
the bucket permissions or the test will fail.
 2019-08-02 13:42:13 -04:00
Feanil Patel
dead415d2b :-( Moto and HTTPretty don't play well together. 
Moto has a vendored version of HTTPretty which also monkey patches the
socket object.  If you activate both, you get weird errors like
https://github.com/spulec/moto/issues/750

So we're opting not to activate both in this test.  We're are just using
the moto vendored version of httpretty for both our usage and the
mocking of boto.

I also removed the logic that seemed like it was just testing that our
mock is a mocking s3 correctly.
 2019-08-02 13:42:10 -04:00
Feanil Patel
a5afacf62a These tests don't test anything interesting. 
They are running into issues because of a bug in moto but looking closer
at what they are testing.  Both tests test the happy path of the
underlying function.  In the happy path scenario all boto calls succeed
and all theses test do is test that but with all the boto calls mocked
out.  So we're just testing whether the mock is a good mock of boto
which is not useful.
 2019-08-02 13:42:06 -04:00
Feanil Patel
624455c89a Use deprecated s3 mock from moto. 
Longer term we should move to boto3 in general and then we can use the
default moto mock for s3.
 2019-08-02 13:42:02 -04:00
Feanil Patel
519e3a7ca3 Run make upgrade 2019-08-02 13:41:59 -04:00
Feanil Patel
74132f8ed9 Update moto to support python3. 
We had to pin json diff because of how we pull prod requirements into
testing.txt
 2019-08-02 13:41:55 -04:00
Calen Pennington
ea8c8e8348 Test the django admin view, and that it can be loaded 2019-08-02 13:27:16 -04:00
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
8f457d2045 Upload the coverage report from reports/${TEST_SUITE}.coverage 2019-07-31 14:55:30 -04: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