Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave St.Germain
73213c7d33 Pin django-simple-history until someone verifies that the new version works 2018-12-21 11:16:27 -05:00
Dave St.Germain
c4e65fe04e Pin django-simple-history until someone verifies that the new version works 2018-12-21 11:15:42 -05:00
Dave St.Germain
f75dff1ec7 Enabled edx-proctoring as a Pluggable Django App. 2018-12-21 11:15:10 -05:00
Ned Batchelder
dd823833af $ make upgrade 2018-12-21 11:15:10 -05:00
Michael Roytman
23fcb7e7bb Removed course-run exam rule configuration 2018-12-21 11:14:58 -05:00
Matt Hughes
72a2e191fd Set up new proctoring service JS 
also move mockprock (dev only proctoring service)'s JS to
devDependencies
 2018-12-21 11:14:37 -05:00
Ned Batchelder
08222f1acb make upgrade 2018-12-21 11:14:37 -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
Matt Hughes
91b9478755 Set NPM dependencies more stably 
also manually increment edx-proctoring version, since that's all we
wanted to achieve with this
 2018-12-21 11:07:59 -05:00
Matt Hughes
6264d75f49 Fix some eslint errors on touched files 
Also package lock was tricky in how specifically it wanted to be
updated
 2018-12-21 11:07:58 -05:00
edx-cache-uploader-bot
ae89d7dd41 Updating migrations 2018-12-21 11:07:39 -05:00
Matt Hughes
0a33fb6bb6 Fixed karma setup bug with new webpack config 2018-12-21 10:54:51 -05:00
Matt Hughes
7fdc0fb217 switch npm proctoring dependencies to not depend on relative paths 2018-12-21 10:54:51 -05:00
Matt Hughes
5902a59a0f Add another all-over-the-LMS JS file 2018-12-21 10:54:51 -05:00
Matt Hughes
6430dc42a6 [WIP]: reverse order of npm dependencies 
also ensures that our proctoring JS will run through babel, even while
we have npm dependencies installed on a local-only basis
 2018-12-21 10:54:51 -05:00
Matt Hughes
658fd6c139 Consolidate worker-targetting webpack config in common 
This changes the production config. Spooky scary!
 2018-12-21 10:54:51 -05:00
Matt Hughes
edd15f1bdb WIP: currently dev-only approach to proctoring webworker JS API 2018-12-21 10:54:51 -05:00
Dave St.Germain
5e627145ed Updated edx-proctoring pre-release 2018-12-21 10:54:51 -05:00
Dave St.Germain
380b163418 Added proctor backend dashboard to the instructor dashboard 2018-12-21 10:54:51 -05:00
Michael Roytman
ecabcf90dd Enable course run level overrides for proctoring configuration. 2018-12-21 10:54:51 -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
muhammad-ammar
7b3359d0db update enterprise version to 1.2.1 
ENT-1416
 2018-12-21 16:50:56 +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
Régis Behmo
9d00c8798d Faster "npm install" without progress bar 
In older versions of npm, displaying a progress bar considerably slows
down "npm install" commands: https://github.com/npm/npm/issues/11283

In Ubuntu 16.04 (supported by open edx) the default version of npm is
3.5.2, so it is affected this issue. The progress bar can be deactivated
globally by running "npm set progress=false", but this is a little-known
command.

With this change, all edx-platform developers benefit from the speed
increase. On a production server with excellent bandwidth, we made the
following benchmark:

rm -rf ./node_modules ~/.npm && npm set progress=false && time npm
install
real    3m29.980s
user    2m36.152s
sys     0m20.868s

rm -rf ./node_modules ~/.npm && npm set progress=true && time npm
install
real    7m5.580s
user    6m2.824s
sys     0m20.304s

There is thus a ~57% improvement on a task that is typically quite
time-consuming, with minimal inconvenience for developers.
 2018-12-20 16:21:22 +01: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