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

3485 Commits

Author SHA1 Message Date
Alex Dusenbery
a3ac84f007 Ignore expected call order in cohorts test. 2019-05-03 14:43:07 -04:00
Alex Dusenbery
403fb52e93 Add a GET endpoint to list ProgramCourseEnrollment data. 2019-05-03 13:39:10 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
7b4b6c3539 Move notifier and notification_prefs to discussion/ 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
16edae0822 Move comment_client into django_comment_common 2019-05-03 12:07:20 -04:00
Matthew Piatetsky
75dc4459cd add first purchase discount banner on course home 2019-05-02 16:14:16 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -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
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
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
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
2839851bde Move comment_client into django_comment_common 2019-05-01 19:13:09 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -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
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
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
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
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
Michael Youngstrom
e868c54a18 INCR-176 2019-04-26 15:42:24 -04:00
Feanil Patel
a774618853 Readme for the user_api. 2019-04-26 13:27:56 -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
2359233976 Merge pull request #20338 from edx/ormsbee/heartbeat_readme 
Initial README for heartbeat app
 2019-04-26 11:30:28 -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
Michael Youngstrom
295f0f5f8a Merge pull request #20333 from edx/youngstrom/INCR-192 
INCR-192
 2019-04-25 17:01:45 -04:00
Stu Young
48c32a4367 Merge pull request #20316 from eduNEXT/anmrdz/INCR-193 
INCR-193
 2019-04-25 16:19:36 -04:00
David Ormsbee
a148d63f95 Initial README for heartbeat app 2019-04-25 16:00:53 -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
David Ormsbee
d2acc70f9f Update user_authn README to new format. 2019-04-25 15:49:43 -04:00
David Ormsbee
e2ec126d0d Initial README for Discussion 2019-04-25 15:13:59 -04:00
Michael Youngstrom
ceaff53be6 INCR-192 2019-04-25 14:14:48 -04:00
Michael Youngstrom
adb426d56f Merge pull request #20327 from edx/youngstrom/INCR-120 
INCR-120
 2019-04-25 14:00:51 -04:00
Constanza Abarca
bf0c109b66 INCR-191 2019-04-25 13:51:23 -04:00
Nimisha Asthagiri
dd94ae7e37 Refactor per Scouts rule 2019-04-25 13:33:30 -04:00
Stu Young
492d4eee34 Merge pull request #20315 from eduNEXT/anmrdz/INCR-165 
INCR-165
 2019-04-25 12:21:34 -04:00
Douglas Hall
d54a7109a6 Merge pull request #20323 from edx/douglashall/order_history_site_check 
Add site configuration check to order history MFE toggle.
 2019-04-25 12:10:53 -04:00
Stu Young
73578845ae Merge pull request #20317 from eduNEXT/anmrdz/INCR-174 
INCR-174
 2019-04-25 12:04:13 -04:00
Douglas Hall
9880676e6a Add site configuration check to order history MFE toggle. 2019-04-25 11:10:08 -04:00
Michael Youngstrom
2935466408 INCR-120 2019-04-25 10:31:19 -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