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

19277 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Feanil Patel
7b807c6eb6 Initial README for the courseware djangoapp. 2019-04-25 12:06:10 -04:00
Douglas Hall
9880676e6a Add site configuration check to order history MFE toggle. 2019-04-25 11:10:08 -04:00
Zainab Amir
7ff21161d0 Merge pull request #20310 from edx/zamir/LEARNER_1338_firefox_footer_fix 
update class to fix footer lang button for firefox
 2019-04-25 19:52:48 +05: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
Zainab Amir
34c08a4ac2 update class to fix footer lang button for firefox 2019-04-25 15:52:07 +05:00
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
Waheed Ahmed
ff07b3057e Merge pull request #20308 from edx/waheed/PROD-225-fix-account-settings-lang-selection 
Fix account settings page language selection.
 2019-04-24 20:01:03 +05:00
Zach Hancock
afe3cdb3ec user lookup util 2019-04-24 09:47:38 -04:00
Waheed Ahmed
322fca2c6f Fix account settings page language selection. 
Fixed generating transifex URL for two character language codes.

PROD-225
 2019-04-24 18:25:59 +05:00
Zainab Amir
e0296b373c Update the compiled js and jsx strings 
Right now pull_translations job does not compile the js and jsx
strings automatically, so manually added them here.

LEARNER-7045
 2019-04-24 12:18:20 +05: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
Zainab Amir
255583874f Merge pull request #20283 from edx/zamir/LEARNER_1338_add_css_rule_to_edx_theme 
Update edx.org theme to add new css rule
 2019-04-23 11:40:46 +05: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