Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Nimisha Asthagiri
31e9219c89 Discussion consolidation: review comments 2019-05-01 21:13:57 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Nimisha Asthagiri
c2e232a3d4 Discussion consolidation: quality 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
97862d2ed7 Move notifier and notification_prefs to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
3d1bb23809 Move discussion_api to discussion/rest_api 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
2839851bde Move comment_client into django_comment_common 2019-05-01 19:13:09 -04:00
David Ormsbee
50a8360b1a Merge pull request #20023 from open-craft/symbolist/capa-xblock-1 
CapaModule to ProblemBlock [SE-397]
 2019-05-01 12:18:50 -04:00
Alex Dusenbery
20f0bc03d4 Add a GET API endpoint for program enrollments. 2019-05-01 11:35:38 -04:00
Usman Khalid
41c6236e0a Convert CapaModule to ProblemBlock. 
* Minimum possible changes were made to merge CapaModule & CapaDescriptor into
  one ProblemBlock class.
* There are no known changes in behavior.
* CapaModule and CapaDescriptor inherited from a number of classes which inherit
  from XModule or XModuleDescriptor but did not depend on them. For all these
  classes the methods were moved to mixins which did not inherit from either and
  then these mixins were added to ProblemBlock in the order which maintains MRO.
 2019-05-01 20:08:36 +05:00
Nimisha Asthagiri
c8f8e05616 Merge pull request #20339 from edx/bom/experiments_readme 
Initial README for the experiments app
 2019-05-01 09:07:42 -04:00
Nimisha Asthagiri
7fd001d465 Merge pull request #20348 from edx/bom/grades-readme 
Initial README for Grades
 2019-05-01 08:45:32 -04:00
Ned Batchelder
1113c4baec Merge pull request #20286 from edx/nedbat/sec-367 
URL patterns should be anchored. SEC-367
 2019-05-01 08:25:05 -04:00
Feanil Patel
b29e681dd5 Merge pull request #20352 from edx/feanil/learner_dashboard_readme 
Update learner dashboard README.
 2019-05-01 08:01:35 -04:00
Feanil Patel
cf95e5cb50 Update learner dashboard README. 2019-05-01 08:00:17 -04:00
Dave St.Germain
e15b86c9f3 Added a reason field for due date extensions 2019-04-30 15:22:50 -04:00
Jeremy Bowman
097807dc49 Fix time zone bug in send_verification_expiry_email (#20350) 2019-04-30 13:00:55 -04:00
DawoudSheraz
6d137790a4 avoid video url rewrite for third party videos 2019-04-30 10:53:53 +05:00
edx-pipeline-bot
bfea6765f4 Merge pull request #20359 from edx/release-mergeback-to-master 
Merge release back to master
 2019-04-29 20:54:35 +05:00
Nimisha Asthagiri
d33652f09f Initial README for Grades 2019-04-28 23:40:41 -04:00
David Ormsbee
02fc547069 Merge pull request #20347 from edx/ormsbee/edxnotes_readme 
Initial commit of README for edxnotes.
 2019-04-26 17:00:27 -04:00
David Ormsbee
d80f8095bc Initial commit of README for edxnotes. 2019-04-26 13:57:37 -04:00
Feanil Patel
ccee040261 Add a readme for the mobile_api. 2019-04-26 13:51:13 -04:00
Nimisha Asthagiri
ba895d0b42 Initial README for the experiments app 2019-04-26 13:36:28 -04:00
Matthew Piatetsky
b64664932d Revert "Merge pull request #20272 from cpennington/revmi-34-recheck-access" 
This reverts commit 5d99714aed, reversing
changes made to 5424155cd0.
 2019-04-26 13:19:13 -04:00
David Ormsbee
b667376d4b Merge pull request #20335 from edx/ormsbee/discussion_readme 
Initial README for Discussion
 2019-04-25 15:56:09 -04:00
Feanil Patel
0316ec760c Merge pull request #20329 from edx/feanil/courseware_readme 
Initial README for the courseware djangoapp.
 2019-04-25 15:14:20 -04:00
David Ormsbee
e2ec126d0d Initial README for Discussion 2019-04-25 15:13:59 -04:00
Alan Zarembok
475262a516 Merge pull request #20326 from edx/azarembok/fix-bulk-email-query 
PROD-9: Fix badly performing database query for bulk email by using
 2019-04-25 13:41:58 -04:00
Alex Dusenbery
4d6458284c Fix the program_enrollments admin classes. 2019-04-25 13:06:06 -04:00
Feanil Patel
7b807c6eb6 Initial README for the courseware djangoapp. 2019-04-25 12:06:10 -04:00
David Ormsbee
0de369a4e3 Merge pull request #20095 from stvstnfrd/sysadmin/version 
Remove unused version from footer
 2019-04-25 10:23:42 -04:00
Dave St.Germain
589bd9b660 Merge pull request #20121 from edx/dcs/add-edx-when 
Add edx-when
 2019-04-25 10:00:57 -04:00
Alan Zarembok
30b9692915 PROD-9: Fix badly performing database query for bulk email by using 
the union() function to combine multiple querysets together, rather
than the or (|) operator.  This avoids a very inefficient OUTER
JOIN query that reads the entire user table.
 2019-04-25 08:55:59 -04:00
Guruprasad Lakshmi Narayanan
73ab30e342 Fix the order randomization behaviour of Randomized Content Block 
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
 2019-04-25 10:23:46 +05:30
Dave St.Germain
42ede57383 Hide edx-when feature behind waffle flag 2019-04-24 16:36:56 -04:00
Alex Dusenbery
bf661eaa8d Add unique constraint to ProgramEnrollment model 2019-04-24 13:47:23 -04:00
Dave St.Germain
b4ccd03740 This adds a new django app -- edx-when -- that will copy start and due dates to mysql and allow per-learner overrides in the instructor dashboard, using the existing IDDE interface. 
It adds a data migration for existing IDDE data.
 2019-04-24 12:26:19 -04:00
Zach Hancock
afe3cdb3ec user lookup util 2019-04-24 09:47:38 -04:00
asadazam93
5a5c3fd79e Don't include invisible, graded subsections in grade reports. 2019-04-23 14:23:29 -04:00
Ned Batchelder
2171ddb9df URL patterns should be anchored. SEC-367 
Some notes:

* The completion API was pulled out into a new repo, but left behind a
  url() entry.  That entry used a different namespace than the
  pulled-out repo, so I had to fix the one place we used the namespace.

* Two urls couldn't be anchored because they broke tests:

    url(r'users/(?P<user_id>\w+)/followed$', views.followed_threads, name='followed_threads'),
    url(r'users/(?P<user_id>\w+)$', views.user_profile, name='user_profile'),
 2019-04-23 09:19:23 -04:00
Jansen Kantor
d378260d48 Merge pull request #20284 from edx/jkantor/prog-course-enroll-admin 
add program course enrollment admin
 2019-04-22 14:35:25 -04:00
Matt Hughes
2dc19c4139 Merge pull request #20263 from edx/matthugs/EDUCATOR-4158-logged-out-course-page-masters-only-courses 
Remove misleading copy for Master's-only courses' course pages'
 2019-04-22 11:02:59 -04:00
Diana Huang
d4ea154945 Merge pull request #20276 from edx/diana/remove-microsites-bulkenroll 
Remove references to microsites in bulk enroll.
 2019-04-22 10:13:01 -04:00
jansenk
8389702765 add program course enrollment admin 2019-04-22 10:05:36 -04:00
Calen Pennington
4069594b19 Merge pull request #20250 from cpennington/bridgekeeper-adr 
Write up Bridgekeeper proposal for permissions
 2019-04-22 10:04:03 -04:00
Diana Huang
4a61e6bb70 Remove references to microsites in bulk enroll. 2019-04-22 09:25:39 -04:00
Jansen Kantor
fbf699b915 Merge pull request #20270 from edx/jkantor/program-course-enroll 
add ProgramCourseEnrollment
 2019-04-19 16:18:48 -04:00
jansenk
0622c69d75 add ProgramCourseEnrollment 2019-04-19 12:56:50 -04:00
Matt Hughes
1070ba0236 WIP: Remove misleading copy for Master's-only courses' course pages' 
Logged out learners shouldn't be lead to believe they'll be able to
enroll themselves into such courses, which we're worried they may've
read into the existing copy

JIRA:EDUCATOR-4158
 2019-04-19 10:30:24 -04:00