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

48014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Jansen Kantor
b2b92308d8 Merge pull request #19436 from edx/jkantor/list-user-roles2 
Add API call to list roles of the logged-on user
 2018-12-12 15:59:14 -05:00
Alex Dusenbery
e44c6af957 Gradebook: add attempted field to subsection data, remove 2 unused fields. 2018-12-12 15:23:32 -05:00
jansenk
0fb7c101c7 Add API call to list roles of the logged-on user 
EDUCATOR-3796
 2018-12-12 14:54:07 -05:00
Zubair Afzal
14009d3a6b Merge pull request #19425 from edx/zub/ENT-1324-add-enterprise-customer-types 
ENT-1324 Update enterprise app version to 1.1.2
 2018-12-12 16:33:36 +05:00
zubair-arbi
217b63b492 ENT-1324 Update enterprise app version to 1.1.2 2018-12-12 15:46:26 +05:00
raeeschachar
dc37fb2cbc Merge pull request #19416 from edx/raees/update-bootstrap 
Updated edx-bootstrap version to 1.0.3. Updating it on platform as part of
 2018-12-12 15:30:43 +05:00
Awais Jibran
fda85ddcf5 Merge pull request #19418 from edx/aj/fix-segmentio-event 
Handle string datetime with datetime parser.
 2018-12-12 12:08:08 +05:00
Ned Batchelder
9aef89ab2d Merge pull request #19419 from edx/nedbat/constraints-file 
Constraints file for pinning packages
 2018-12-11 19:35:13 -05:00
Ned Batchelder
fe57498a4d $ make upgrade 2018-12-11 17:13:41 -05:00
Ned Batchelder
e4adce6869 Pin edx-lint to keep the version stable 2018-12-11 17:13:41 -05:00
Ned Batchelder
75b051b336 Use a contraints.txt file to force versions. 2018-12-11 17:13:41 -05:00
Awais Jibran
ddd69db7cf Handle string datetime with datetime parser. 2018-12-11 13:24:10 -05:00
Ned Batchelder
6d4e49458d Remove a pin that is no longer needed 2018-12-11 12:25:08 -05:00
Calen Pennington
bbc1326685 Merge pull request #19089 from mitodl/xblock_aq_changes 
Refactored XBlockAside rendering and added support for student view
 2018-12-11 12:13:37 -05:00
Calen Pennington
472407cf04 Merge pull request #19415 from edx/dsheraz/static_fix 
Static storage fix test
 2018-12-11 10:13:31 -05:00
Simon Chen
b18116d093 Merge pull request #19412 from edx/schen/frozen_grades 
Add grades_frozen flag to grading info api for Gradebook
 2018-12-11 10:02:22 -05:00
Simon Chen
cbffeedb07 Add grades_frozen flag to grading info api for Gradebook 2018-12-11 08:33:22 -05:00
raeeschachar
76cfbf9a2f Updated https://www.npmjs.com/package/@edx/edx-bootstrap version to 1.0.3. Updating it on platform as part of 
https://openedx.atlassian.net/browse/LEARNER-3659
 2018-12-11 16:49:47 +05:00
DawoudSheraz
7b75e18f04 Static storage fix test 2018-12-11 13:58:28 +05:00
Gavin Sidebottom
3dad2be55d Refactored XBlockAside rendering and added support for student view 2018-12-11 12:27:03 +05:00
Alex Dusenbery
353fe07c27 Remove flaky test_logout_cancel_no_redirect bokchoy test 2018-12-10 16:43:15 -05:00
Alex Dusenbery
a853c03615 Remove flaky test_hls_video_with_youtube_blocked bokchoy test 2018-12-10 15:29:56 -05:00
Jeremy Bowman
4fbefc616f Merge pull request #19395 from edx/jmbowman/TE-2812 
TE-2812 Better output when print_setting fails
 2018-12-10 14:28:29 -05:00
Alex Dusenbery
89f3825220 Gradebook: check if subsection grade has an override when including earned/possible scores. 2018-12-10 14:11:21 -05:00
Ned Batchelder
36689eb27d Merge pull request #19388 from edx/nedbat/pin-idna 
Pin idna<2.8 to resolve 'make upgrade' conflict
 2018-12-10 14:08:07 -05:00
Michael Youngstrom
45f834aef0 Merge pull request #19402 from edx/testeng/bokchoy_auto_cache_update_9e270636e02e8c783099fbd262c60f2d3f748b16 
Bokchoy db cache update
 2018-12-10 12:12:26 -05:00
David Ormsbee
192ed213f6 Merge pull request #19284 from open-craft/symbolist/access-for-unenrolled-learners 
Access for unenrolled learners.
 2018-12-10 11:03:00 -05:00
Jeremy Bowman
a457d88c7a TE-2812 Better output when print_setting fails 2018-12-10 10:59:04 -05:00
edx-cache-uploader-bot
6414577fd1 Updating migrations 2018-12-10 10:54:10 -05:00
Simon Chen
e571f81f39 Merge pull request #19398 from edx/schen/move_gradebook 
Update the gradebook view auth from global staff only to course staff
 2018-12-10 10:41:09 -05:00
Alex Dusenbery
59915d24d3 Swagger API Docs fix: Add the base DRF Serializer as the serializer class for course_groups views that don't specify one. 2018-12-10 10:25:33 -05:00
Simon Chen
02103f7660 Update the access to gradebook to allow course staff and admins 2018-12-10 10:07:27 -05:00
Simon Chen
9866b045c0 Merge pull request #19401 from edx/schen/cohort_access 
Update cohort access to allow course staff to get cohorts as well as global staff
 2018-12-10 10:02:29 -05:00
Calen Pennington
41b274fb05 Merge pull request #19393 from cpennington/anonymous-user-metadata 
Don't add user groups to the experiment metadata for Anonymous users
 2018-12-10 09:57:47 -05:00
Saleem Latif
1a8df45179 Merge pull request #19400 from edx/saleem-latif/ENT-1116-updates 
ENT-1116: Add recovery email to account settings page
 2018-12-10 18:37:27 +05:00
Simon Chen
9a5b26ff33 Update cohort access to allow course staff to get cohorts as well as global staff 2018-12-10 08:35:55 -05:00
Saleem Latif
bd411de12d Add recovery email to account settings page 2018-12-10 17:59:19 +05:00
Matthew Piatetsky
a55ed88378 Merge pull request #19342 from edx/bessiesteinberg/REVE-104-forum-mods 
REVE-104 & REVE-108: Ensure Course Roles' Access
 2018-12-07 17:38:46 -05:00
Ned Batchelder
e9d55a2110 Merge pull request #19361 from edx/nedbat/cri-136 
Use XBlock services to get translation at runtime CRI-136
 2018-12-07 16:55:45 -05:00
Ned Batchelder
dcc3ace0d2 Merge pull request #19389 from edx/nedbat/fancy-makefile 
Use loops for requirements files in the Makefile
 2018-12-07 16:46:53 -05:00
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Jeremy Bowman
022023de32 Merge pull request #19384 from edx/jmbowman/TE-2803 
TE-2803 Clone edx-platform in updated xdist worker images
 2018-12-07 15:44:23 -05:00
Calen Pennington
67e88b117a Don't add user groups to the experiment metadata for Anonymous users 
[REVE-158]
[REVE-148]
 2018-12-07 14:42:26 -05:00
Jeremy Bowman
58a2045756 TE-2803 Clone edx-platform in updated xdist worker images 2018-12-07 14:17:51 -05:00
Paulo Viadanna
c4fc4b5df6 Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses. 
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
 2018-12-07 22:17:36 +05:00
Ned Batchelder
f90fd16523 Use loops for the requirements files 2018-12-07 11:53:27 -05:00
Ned Batchelder
a988231d3d An .editorconfig file 
Note: this is not the current latest thing we're working on in edx-lint,
but it at least gets us tabs for Makefiles....!
 2018-12-07 11:52:45 -05:00
Ned Batchelder
f5c5d6f415 make upgrade 2018-12-07 11:49:58 -05:00
Ned Batchelder
7945e59f76 Pin idna to prevent conflicts 2018-12-07 11:23:40 -05:00