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

49438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Feanil Patel
a9a407de9c Merge pull request #20345 from edx/feanil/user_api_readme 
Readme for the user_api.
 2019-04-26 15:44:28 -04:00
Michael Youngstrom
e868c54a18 INCR-176 2019-04-26 15:42:24 -04:00
Feanil Patel
839c778e14 Merge pull request #20346 from edx/feanil/mobile_api_readme 
Add a readme for the mobile_api.
 2019-04-26 15:41:13 -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
Feanil Patel
49a42787a5 Merge pull request #20331 from edx/feanil/add_codeowners 
An initial breakdown of our areas of the monolith.
 2019-04-26 13:49:54 -04:00
Nimisha Asthagiri
ba895d0b42 Initial README for the experiments app 2019-04-26 13:36:28 -04:00
Feanil Patel
a774618853 Readme for the user_api. 2019-04-26 13:27:56 -04:00
David Ormsbee
adb14e13e2 Merge pull request #20334 from edx/ormsbee/xmodule_readme 
Initial README for XModule
 2019-04-26 13:25:03 -04:00
David Ormsbee
5b4ff6c3af Merge pull request #20332 from edx/ormsbee/track_readme 
Initial README for Track app
 2019-04-26 13:24:44 -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
Matt Drayer
6a09385ea5 Merge pull request #20342 from edx/mattdrayer/edx-enterprise-1.4.8 
Bump to edx-enterprise 1.4.8
 2019-04-26 12:27:58 -04:00
David Ormsbee
2359233976 Merge pull request #20338 from edx/ormsbee/heartbeat_readme 
Initial README for heartbeat app
 2019-04-26 11:30:28 -04:00
Matt Drayer
bd05fda8cc Bump to edx-enterprise 1.4.8 2019-04-26 11:30:14 -04:00
Michael Youngstrom
2cd6e4650c Merge pull request #20322 from eduNEXT/coa/incr-191 
INCR-191
 2019-04-26 11:29:10 -04:00
David Ormsbee
42f76a6483 Merge pull request #20337 from edx/ormsbee/user_authn_readme 
Update user_authn README to new format.
 2019-04-26 11:27:19 -04:00
Nimisha Asthagiri
6623553649 Merge pull request #20321 from edx/arch/account-settings-enterprise 
Account API: enforce Enterprise policy on backend
 2019-04-25 17:50:25 -04:00