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

22621 Commits

Author SHA1 Message Date
Douglas Hall
82038870aa Merge pull request #17808 from edx/douglashall/ENT-936 
ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration.
 2018-03-28 15:39:15 -04:00
Sanford Student
0bfe9c8d94 remove showbydefault 2018-03-28 15:33:52 -04:00
Ned Batchelder
465427f454 Merge pull request #16297 from open-craft/cornwell/content-of-static-pages 
Ability to set content of static pages via Site Configuration
 2018-03-28 14:28:19 -04:00
Douglas Hall
2ecbe19b29 ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration. 2018-03-28 14:00:35 -04:00
Alex Dusenbery
26ba411eb0 EDUCATOR-2535 | Small style cleanup for course outline. 2018-03-28 10:42:20 -04:00
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Troy Sankey
81ed96bc88 bump django to 1.11.11 2018-03-27 15:55:07 -04:00
hamzamunir7300
e30e12e83d Merge pull request #17797 from edx/LEARNER-4766 
Footer Chinese Language Dupluication Issue
 2018-03-27 19:34:03 +05:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue 
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
 2018-03-27 19:19:37 +05:00
Ahsan Ulhaq
ea9a679c27 small nit 2018-03-27 16:59:07 +05:00
Ahsan Ulhaq
7428b2fe94 Discovery for pdf cert generation 
LEARNER-4520
 2018-03-27 15:23:46 +05:00
Nimisha Asthagiri
e5b9452e76 Merge pull request #17385 from mitodl/hack18_instructor_django_plugin 
Changed 'instructor' django app to follow plugin pattern
 2018-03-26 15:20:47 -06:00
Brittney Exline
1b4ac84141 Merge pull request #17788 from edx/bexline/verify_student_cleanup 
ENT-934 Remove deprecated models in verify_student
 2018-03-26 13:51:35 -06:00
Troy Sankey
fe9990608d Merge pull request #17782 from edx/pwnage101/improve-old-banner-appearance 
move global status messages to the user notificatio area
 2018-03-26 14:58:54 -04:00
Brittney Exline
956b627501 ENT-934 Remove deprecated models in verify_student 
These models say they are to be fully removed in Hawthorn, so let's make it happen!
 2018-03-26 14:48:34 -04:00
Michael LoTurco
a3fdf8827d Merge pull request #17785 from edx/MLoTurco/learner-3925-support-link 
Adds entitlement tool to support tool home
 2018-03-26 13:44:43 -04:00
Michael LoTurco
537b6652c2 adds entitlment tool to support tool home 2018-03-26 12:53:22 -04:00
Troy Sankey
b1ce012a94 move global status messages from the header to the user notification area 2018-03-26 12:06:29 -04:00
Eric Fischer
b35d227cc3 Merge pull request #17760 from edx/efischer/EDU-499 
Remove PRUNE_OLD_VERSIONS waffle flag
 2018-03-26 11:59:31 -04:00
Gavin Sidebottom
7626d4abf0 Changed 'instructor' django app to follow plugin pattern 2018-03-26 10:44:41 -04:00
Albert (AJ) St. Aubin
7c6c2a1664 Merge pull request #16757 from appsembler/omar/search-for-courses-api 
Add search for courses API to allow building a mobile native search view
 2018-03-26 07:31:36 -04:00
Mike
0e2b667bb4 Added ability to change header and content of static pages in two ways. 
1. Using the pageheader and pagecontent block names.
2. Setting SiteConfiguration settings for each individual html page.

Co-authored by: Tomasz Gargas <tomasz@opencraft.com>
 2018-03-24 21:37:09 +01:00
Michael LoTurco
4c2eab4100 Merge pull request #17756 from edx/MLoTurco/learner-3925-div-form 
add entitlement creation and reissue to support
 2018-03-23 18:26:18 -04:00
Alex Dusenbery
10be8bcd4e add entitlement support creation and reissue 
Learner-3925
 2018-03-23 17:10:46 -04:00
Troy Sankey
9f30a75a08 add missing maintenance banner settings 2018-03-23 16:34:47 -04:00
Eric Fischer
242ac4c9cd Remove PRUNE_OLD_VERSIONS waffle flag 2018-03-23 12:41:08 -04:00
Eric Fischer
97151ae4f4 Merge pull request #17761 from edx/efischer/EDUCATOR-2456 
Delete some unused settings
 2018-03-23 11:21:12 -04:00
McKenzie Welter
fa90d6e651 Merge pull request #17640 from edx/McKenzieW/learner-4400 
Move support actions to existing entitlement api
 2018-03-23 10:37:52 -04:00
Eric Fischer
2b9ee25618 Clean up unused settings 
Initially introduced here:
  e0aa8cf78a (diff-8a23909bc8d201fba8525b1dd6396247)

Rendered irrelevant here:
  ece0ea00e9
 2018-03-23 10:26:16 -04:00
hamzamunir7300
e9d6c8537c Merge pull request #16395 from edx/footer-design-non-bootstrap 
Footer Design Implementation without using bootstrap WIP
 2018-03-23 08:35:49 +05:00
Hamza Munir
a69ecd83d5 Footer Design Implementation without using bootstrap WIP 
The New footer design implementation without using bootstrap. Using flexbox
creating new classes to assign different widths in different screen breakpoints.

LEARNER-2312
 2018-03-23 02:37:59 +05:00
McKenzie Welter
e5d1f04a89 move support actions to existing entitlement api 2018-03-22 16:11:46 -04:00
Rabia Iftikhar
32863e4463 Merge pull request #17730 from edx/ri/EDUCATOR-2428-certificate-delivered-column 
EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report
 2018-03-23 00:26:44 +05:00
Alex Dusenbery
a996822094 Revert "Revert "Track viewing of individual blocks."" 
This reverts commit e2675f57b5f747b6a9e21067c75911fbd0341943.
 2018-03-22 10:37:40 -04:00
Bill Filler
305bd7dd4b Merge pull request #17650 from edx/ibrahimahmed443/WL-1473-add-fields-instructor-dashboard 
Ibrahimahmed443/wl 1473 add fields instructor dashboard
 2018-03-22 09:56:43 -04:00
Matthew Piatetsky
60fb4aa277 Control refund message with optimizely flag 2018-03-21 17:19:46 -04:00
rabiaiftikhar
0f63a2727e EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report 2018-03-21 21:31:07 +05:00
Michael Terry
a576d682ff Improve password complexity messaging 
Send password form instructions that include password complexity and
also send error messages back that include all parts of the
complexity instead of single parts at a time.

And clean up phrasing to be more consistent.
 2018-03-21 10:29:53 -04:00
Giulio Gratta
0ffe133f68 Encodes staff profile names as they can be unicode 2018-03-20 14:28:16 -07:00
Eric Fischer
c27c26c790 Merge pull request #17721 from edx/efischer/EDU-2516 
LTI context_title and context_label params
 2018-03-20 14:22:27 -04:00
Michael Terry
56dfa7e622 Drop student_account/account.js 
This doesn't seem to be used anywhere. Maybe should have been
deleted in revision 7dc0598.
 2018-03-20 13:11:23 -04:00
Eric Fischer
f1fa7b8e06 pass title/label to LTI consumers 2018-03-20 12:51:39 -04:00
Michael Terry
a0c6f66252 Check policy during pw live validation 
The password live validation was not considering the full password
complexity settings. This branch hooks that up and refactors the
various ways to validate a password to all go through the same code
path.

LEARNER-4502
LEARNER-4504
 2018-03-16 09:23:43 -04:00
Ibrahim
2bb790680a add role and expose reason field to Instructor Dashboard Manual Enrollment 
WL-1473
 2018-03-16 15:47:53 +05:00
Robert Raposa
0d60d85e2f Merge pull request #17688 from edx/robrap/update-waffle-docs 
Add docs for handling default values.
 2018-03-15 17:26:02 -04:00
Michael LoTurco
2bebb88cb3 Merge pull request #17665 from edx/MLoTurco/learner-3925-table 
Add entitlement table to support app

Learner-3925
 2018-03-15 14:12:12 -04:00
Michael LoTurco
be1b800475 Add Table to entitlement support app 
Learner-3925
 2018-03-15 13:20:31 -04:00
Robert Raposa
c7268f2293 Remove flaky test and commented-out tests. 
Presumably the commented-out tests were also flaky at one point, and
the current process is to remove flaky tests.

EDUCATOR-2512
 2018-03-15 09:59:06 -04:00
attiyaishaque
b239d7b8d7 Allow staff to see all units when viewing the course outline. 2018-03-15 15:02:36 +05:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view 
LEARNER-4428
 2018-03-14 20:29:51 +05:00