Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,991 Commits 1 Branch 0 Tags
4fbefc616fe8827334ca60ab752f684dfc72f333
Commit Graph

47991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Farhanah Sheets
2d338b34aa Merge pull request #18992 from open-craft/josh/progress_data_block 
Put certificate data message into it's own block for overriding
 2018-12-07 10:58:28 -05:00
Farhanah Sheets
7e1cc16b10 Merge pull request #18477 from eduNEXT/dqe/Missing-translation-EDUCATOR-1338 
Missing translation EDUCATOR-1338
 2018-12-07 10:57:36 -05:00
Squirrel18
002227f970 Add gettext string to underscore template. 2018-12-07 09:33:34 -05:00
Cali
5a1f514db9 Merge pull request #19359 from edx/cstenson/has_purchased_metadata 
Add user_metadata to reflect if a user has purchased before.
 2018-12-07 09:30:36 -05:00
Cali Stenson
241cff006a Add user_metadata to reflect if a user has purchased before. 
REVO-20
 2018-12-07 07:48:32 -05:00
DawoudSheraz
6840da3f5d Merge pull request #19373 from edx/dsheraz/educator3605 
EDUCATOR-3605 Adding Visible Labels for search and filter inputs
 2018-12-07 11:45:41 +05:00
DawoudSheraz
bf99e15707 EDUCATOR-3605 Adding Visible Labels for search and filter inputs on discussion page 2018-12-07 10:26:04 +05:00
Bill Filler
f945ac6bce Merge pull request #19382 from edx/bfiller/REVE-143 
REVE:143: mobile api check config model before returning expiration date
 2018-12-06 16:51:55 -05:00
Bill Filler
7f18ab0374 Check config model before returning expiration date 2018-12-06 15:22:11 -05:00
Saleem Latif
6ef5305280 Merge pull request #19377 from edx/revert-19318-saleem-latif/ENT-1116 
Revert "ENT-1116:  Add recovery email to account settings page"
 2018-12-06 22:35:10 +05:00
Saleem Latif
a28eb818be Fixed quality and a typo 2018-12-06 21:51:04 +05:00
Alex Dusenbery
62f1a90e1d Update the Gradebook API decision record. 2018-12-06 11:34:27 -05:00
Saleem Latif
18b66819e2 Revert "ENT-1116: Add recovery email to account settings page" 2018-12-06 21:20:46 +05:00
Alex Dusenbery
cb3b7e1822 Make gradebook GET API more performant. 2018-12-06 10:53:16 -05:00
Stu Young
d0ae725454 Merge pull request #19375 from edx/testeng/bokchoy_auto_cache_update_133ba73954bdfcee6d76985a04f8e94af5b1e533 
Bokchoy db cache update
 2018-12-06 10:30:39 -05:00
edx-cache-uploader-bot
8a7e22315c Updating migrations 2018-12-06 09:35:26 -05:00
Saleem Latif
737420d9d3 Merge pull request #19318 from edx/saleem-latif/ENT-1116 
ENT-1116:  Add recovery email to account settings page
 2018-12-06 15:08:51 +05:00
Saleem Latif
2055f94253 Add recovery email to account settings page 2018-12-06 14:27:28 +05:00
Ned Batchelder
32a7b9f604 Use XBlock services to get translation at runtime 2018-12-05 19:28:04 -05:00
Matt Tuchfarber
c263360eda Merge pull request #19355 from edx/tuchfarber/add_content_gating_deduplication_tests 
Add tests to verify access denied message deduplication works
 2018-12-05 14:14:15 -05:00
Matt Tuchfarber
5a60fc1db6 Add tests to verify access denied message deduplication works 2018-12-05 13:40:22 -05:00
Nimisha Asthagiri
405690b7a9 Merge pull request #19372 from edx/arch/move-modulestore-docs 
Colocate Modulestore docs with its code
 2018-12-05 12:25:44 -05:00
Nimisha Asthagiri
b842d4b1f1 Colocate Modulestore docs with modulestore code 2018-12-05 11:08:33 -05:00