Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,456 Commits 1 Branch 0 Tags
464eb5b3542eb3d07feb54128e8e89eb80cc7ced
Commit Graph

49456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
464eb5b354 omgz check if the list is empty before you pick something from it (bokchoy) 2019-05-02 15:40:39 -04:00
Dave St.Germain
d9c7db3c44 Merge pull request #20367 from edx/dcs/ada-reason 
Added a reason field for due date extensions
 2019-05-02 14:27:07 -04:00
Hammad Ahmad Waqas
c1c830160a Merge pull request #20340 from edx/hammad/WL-1913 
WL-1913 | sync_hubspot_contacts Jenkins job disabled due to OOM
 2019-05-02 17:23:53 +05:00
Nimisha Asthagiri
83f35b544d Merge pull request #20355 from edx/bom/discussions-colocation 
Discussions consolidation
 2019-05-02 08:08:03 -04:00
Hammad Ahmad Waqas
0ea3080ed0 slicing users_queryset and fetching users from database according to 
initial_sync_days
 2019-05-02 15:42:55 +05:00
adeelehsan
194d158a3f Merge pull request #20379 from edx/zamir/fix_email_template 
Remove extra quotation mark from template
 2019-05-02 12:40:49 +05:00
Zainab Amir
ceb362d05d Remove extra quotation mark from template 2019-05-02 11:48:14 +05:00
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
Matt Hughes
4d907a4263 Merge pull request #20373 from edx/matthugs/add-rpnowv4-support 
Add support for version 4 of RPNow for proctoring
 2019-05-01 17:25:23 -04:00
edX Transifex Bot
24722433f7 geoip2: update maxmind geolite country database 2019-05-01 17:23:31 -04:00
Bill DeRusha
564e5e2a07 Merge pull request #20375 from edx/revert-18928-activation-email-to-ace 
Revert "Convert Account Activation Emails to edx-ACE"
 2019-05-01 17:19:36 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -04:00
Matt Hughes
27bca7e0ff Add support for version 4 of RPNow for proctoring 
Adds a waffle switch edx_proctoring.rpnowv4_flow which gates several
learner workflow changes which will need to be applied at the time we
cut over a platform to using RPNow version 4 rather than version 2.

JIRA:EDUCATOR-3765
 2019-05-01 15:55:56 -04:00
Alex Dusenbery
59b7cc5ba3 Remove flaky test_education_completed_field bokchoy test. 2019-05-01 13:47:48 -04:00
Alex Dusenbery
4768edabca Fix test_lms.PayAndVerifyTest.test_enrollment_upgrade bokchoy test. 2019-05-01 13:46:35 -04:00
Nimisha Asthagiri
5db761ed5a Merge pull request #20368 from edx/arch/account-settings-toggle 
Account Settings: Toggle for Micro-frontend Redirect
 2019-05-01 13:39:19 -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
Nimisha Asthagiri
2a168a4e1b Account: Toggle for Microfrontend Redirect 
ARCH-636
 2019-05-01 11:31:48 -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
Stu Young
3d3401fec1 Merge pull request #20366 from edx/estute/remove-flaky-studio-grading-test 
remove flaky studio grading test
 2019-04-30 14:03:18 -04:00
Stuart Young
c89a0007eb remove flaky studio grading test 2019-04-30 13:20:06 -04:00
Stu Young
6a8bb99ad0 Merge pull request #20365 from edx/estute/remove-flaky-test 
delete flaky problem type bok choy test
 2019-04-30 13:15:42 -04:00
Jeremy Bowman
097807dc49 Fix time zone bug in send_verification_expiry_email (#20350) 2019-04-30 13:00:55 -04:00
Stuart Young
92192debca delete flaky problem type bok choy test 2019-04-30 09:28:14 -04:00
Syed Muhammad Dawoud Sheraz Ali
77255210dc Merge pull request #20324 from edx/dsheraz/prod-229 
avoid video url rewrite for third party videos
 2019-04-30 13:07:00 +05:00
DawoudSheraz
6d137790a4 avoid video url rewrite for third party videos 2019-04-30 10:53:53 +05:00
Bill Gardynski
0cbf4845cf INCR-197 (#20156) 2019-04-29 13:00:59 -04: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
Michael Youngstrom
0c509689ea Merge pull request #20353 from edx/youngstrom/incr-lms-pages 
INCR-216
 2019-04-29 11:45:13 -04:00
Constanza
24981f87f4 INCR-194 (#20318) 
* INCR-194

* fixed error, the import absolute_import instruction should have been at the beginning of the file

* added empty line required by PEP 8

* fixed comments order

* trailing whitespace fixed
 2019-04-29 10:51:18 -04:00
Michael Youngstrom
872cddedbf INCR 2019-04-29 09:37:44 -04:00
Zainab Amir
a4bfe788d8 Merge pull request #20325 from edx/zamir/LEARNER_7210_LMS_course_search 
LEARNER-7210 : Fix search to show courses one time
 2019-04-29 13:46:25 +05:00
Zainab Amir
14fdc28daa Fix search to show courses one time 
The course_listing.js view injects courses for search in
ul element containing class courses-listing. Removing this
class from journal and journal bundles will solve the problem

LEARNER-7210
 2019-04-29 12:07:56 +05:00
Nimisha Asthagiri
d33652f09f Initial README for Grades 2019-04-28 23:40:41 -04:00
Ned Batchelder
67008cec68 Merge pull request #18928 from shadinaif/activation-email-to-ace 
Convert Account Activation Emails to edx-ACE
 2019-04-27 15:06:18 -04:00
Shadi Naif
07f588517b Convert Account Activation Emails to edx-ACE 2019-04-27 13:21:34 +03:00
Michael Youngstrom
9ec16b2272 Merge pull request #20351 from edx/youngstrom/INCR-176 
INCR-176
 2019-04-26 17:31:26 -04:00