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

48131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
c2a218f379 Merge pull request #19500 from edx/saleem-latif/ENT-1118 
ENT-1118: Update sign in email address for continued access
 2018-12-31 12:27:46 +05:00
Saleem Latif
eaf93d5978 Update sign in email address for continued access 2018-12-31 11:34:05 +05:00
edX Transifex Bot
f44c68fb52 Update translations 2018-12-30 16:23:16 -05:00
Zachary Hancock
b7d53e26ef Merge pull request #19490 from edx/zhancock/monitor-bulk-update 
Add logging to gradebook bulk update
 2018-12-28 09:23:43 -05:00
Matthew Piatetsky
c515b3570e Merge pull request #19495 from edx/REVMI-50 
write tests for when verified mode expires
 2018-12-27 16:08:26 -05:00
Agha Awais
1390aa6051 Merge pull request #19060 from edx/awais/lett_2_bc_instructor_data_download 
TE-2656: Bokchoy tests for Instructor dashboard data download tab
 2018-12-27 16:47:32 +05:00
Agha Awais
22992918d3 Merge pull request #19008 from edx/awais/lett_2_bc_registration 
TE-2654: Course registration bokchoy test
 2018-12-27 16:10:31 +05:00
Agha Awais
992083dd66 Merge pull request #19025 from edx/awais/lett_2_bc_courseware_word_cloud 
TE-2655: Courseware word cloud bokchoy tests
 2018-12-27 15:28:16 +05:00
Agha Awais
5a86f2b276 Bokchoy tests for Instructor dashboard data download tab 2018-12-26 22:10:38 +00:00
Agha Awais
b0d678d77c Courseware wordcloud tests 2018-12-26 21:26:26 +00:00
Agha Awais
371c1df4f3 Course registration bokchoy test 2018-12-26 20:51:15 +00:00
edX Transifex Bot
8593d4dc71 Update translations 2018-12-23 16:13:05 -05:00
Jansen Kantor
49a88db7aa Merge pull request #19502 from edx/jkantor/roles-filter 
add an optional parameter roles query to filter by course
 2018-12-21 15:07:49 -05:00
Zach Hancock
a93fe4d833 add logging to gradebook bulk update 2018-12-21 14:48:09 -05:00
jansenk
547bd7c97a add an optional parameter roles query to filter by course 
EDUCATOR-3796
 2018-12-21 13:32:24 -05:00
Bill Filler
04474d330f Merge pull request #19501 from edx/ziafazal/LEARNER-6874 
LEARNER-6874: Fixed bug which stopped new user link with All edX Users sailthru list
 2018-12-21 12:43:28 -05:00
Zia Fazal
ae34212528 Fixed bug which stopped new user link with All edX Users sailthru list 2018-12-21 12:11:20 -05:00
Stu Young
317b25f334 Merge pull request #19494 from edx/testeng/bokchoy_auto_cache_update_35c66b21cbd42f69d9b4bf3c655e967c4ec7aebe 
Bokchoy db cache update
 2018-12-21 11:52:19 -05:00
Jansen Kantor
62e2ba4503 Merge pull request #19488 from edx/jkantor/list-roles-staff 
add is_staff to roles api response
 2018-12-21 11:14:17 -05:00
edx-cache-uploader-bot
ae89d7dd41 Updating migrations 2018-12-21 11:07:39 -05:00
Calen Pennington
77922ae073 Merge pull request #19478 from edx/hide-empty-content-course-blocks 
REVE-181: Hide empty container blocks from the course blocks api when called by the mobile app
 2018-12-21 10:22:59 -05:00
jansenk
eff58b289a add is_staff to roles api response 
EDUCATOR-3796
 2018-12-21 10:22:29 -05:00
Matthew Piatetsky
e0b5e5cb97 write tests for when verified mode expires 2018-12-21 09:57:33 -05:00
Agha Awais
a6dc71e9d1 Merge pull request #18850 from edx/awais/lett_2_bc_problem_editor_I 
TE-2627: Problem Editor bokchoy tests
 2018-12-21 15:40:58 +05:00
Asad Iqbal
1643ee4068 Merge pull request #19497 from edx/asadiqbal08/ENT-1431 
asadiqbal08/ENT-1431 updated the edx.org template
 2018-12-21 15:08:10 +05:00
Agha Awais
7a6611c9c2 Problem Editor bokchoy tests 2018-12-21 09:17:24 +00:00
asadiqbal
1d94484139 updated the edx.org template 2018-12-21 14:06:17 +05:00
DawoudSheraz
2315180641 Merge pull request #19472 from edx/dsheraz/educator_3786 
EDUCATOR-3786 Anonymous user is not associated to any cohort
 2018-12-21 13:59:06 +05:00
DawoudSheraz
ddf00790b6 EDUCATOR-3786 Anonymous user is not associated to any cohort 2018-12-21 12:47:41 +05:00
Dave St.Germain
055f7323f7 Merge pull request #19491 from edx/dcs/cohort-hack 
Quick fix for cohort problem in enrollment API
 2018-12-20 16:32:46 -05:00
Christopher Pappas
e4a903619c ENT-1427 | Running make upgrade to bump edx-enterprise version 
Bumped version of django-simple-history

Bumping django-simple-history in other requirements files

Removing the django-simple-history constraint as it is no longer an issue

Removing the comment from requirements/constraints about django-simple-history
 2018-12-20 16:29:52 -05:00
Dave St.Germain
28e6565368 Quick fix for cohort problem in enrollment API 2018-12-20 15:47:58 -05:00
Calen Pennington
325fbe4eb2 Hide empty container blocks from the course blocks api when called by the mobile app 
All code in this PR should be removed after REVE-52 is merged and mobile
traffic from older app versions falls to < 5% of the mobile traffic
to the course_blocks api
 2018-12-20 15:17:24 -05:00
Ned Batchelder
0eaa0f8752 Merge pull request #19411 from edx/nedbat/update-edx-lint 
Update edx lint to get .editorconfig file centrally managed.
 2018-12-20 13:34:37 -05:00
Stu Young
a884358097 Merge pull request #19482 from edx/testeng/bokchoy_auto_cache_update_7fc72089583c53637576eeb89c1de4378f86e1ac 
Bokchoy db cache update
 2018-12-20 11:59:11 -05:00
edx-cache-uploader-bot
32c50b338c Updating migrations 2018-12-20 11:15:00 -05:00
George Babey
9d02b29cd7 Merge pull request #17955 from eduNEXT/ednx/Support-Underscore-Templates-Theme 
OSPR-2352 | Support for theming .underscore files
 2018-12-20 10:44:55 -05:00
Feanil Patel
e90ce3a419 Merge pull request #19484 from edx/release-mergeback-to-master 
Merge release back to master
 2018-12-20 09:51:45 -05:00
Jeremy Bowman
cc5b1ce978 Merge pull request #19483 from edx/jmbowman/misc_bokchoy_fixes 
Fixes for assorted flaky bok-choy tests
 2018-12-20 09:44:54 -05:00
Michael Youngstrom
8855bda2e3 Merge pull request #19356 from edx/youngstrom/add-quality-jenkinsfile 
Add Jenkinsfiles for quality and bokchoy
 2018-12-20 09:29:34 -05:00
David Ormsbee
b9eea30bbe Merge pull request #19305 from open-craft/pooja/access-videos-for-unenrolled-learners 
SE-183 Enable video content for anonymous and unenrolled learners
 2018-12-20 09:09:11 -05:00
Zainab Amir
3a180ce94d Merge pull request #19399 from edx/program_fragments_dynamic_type_text 
Add apple fonts to dashboard and programs_fragments for dynamic type text size settings
 2018-12-20 11:47:22 +05:00
Pooja Kulkarni
6f0e5d68d7 Make video contents visible to unenrolled users 
This is based on PR #19284 and is part of the
series of work related to the proposal #18134.

Adds VideoModule.public_view() to enable
unenrolled and anonymous users to view the video
contents of a public course.
When an unenrolled or anonymous user accesses the
video content of a public course, the
public_view() introduced in the previous PR is
used instead of student_view() method.
 2018-12-20 11:56:43 +05:30
Zainab Amir
627c39b9ba LEARNER-6728: Add apple fonts to dashboard and programs_fragments 2018-12-20 11:12:44 +05:00
Jeremy Bowman
b8fee1f9dc Fixes for assorted flaky bok-choy tests 2018-12-19 17:35:52 -05:00
Michael Youngstrom
5c88962d24 Add Jenkinsfile for bokchoy and quality 2018-12-19 17:09:55 -05:00
Feanil Patel
a33bd63464 Merge pull request #19481 from edx/revert-19365-dsheraz/educator_3764 
Revert "EDUCATOR-3764 Mathjax accessibility files"
 2018-12-19 12:44:31 -05:00
Feanil Patel
f81ce41b20 Revert "EDUCATOR-3764 Mathjax accessibility files" 2018-12-19 11:57:52 -05:00
Nimisha Asthagiri
3a45bee3ea Merge pull request #19453 from edx/arch/cleanup-login 
Studio login/registration redirects to LMS
 2018-12-19 11:52:45 -05:00
Brittney Exline
8ecf436597 Merge pull request #19468 from edx/bexline/portal_code_manaagement 
ENT-1173 Update edx-enterprise to 1.1.3
 2018-12-19 09:39:43 -07:00