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

1156 Commits

Author SHA1 Message Date
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Robert Raposa
121a2dda9e Enable Learner Analytics for staff users. 
LEARNER-3905
 2018-01-18 10:22:42 -05:00
Robert Raposa
2a38e25601 Merge pull request #17221 from edx/robrap/LEARNER-3881-LA-for-verified-only 
LEARNER-3881: Disable Learner Analytics for non-verified users.
 2018-01-17 15:11:50 -05:00
Robert Raposa
740be6b304 Disable Learner Analytics for non-verified users. 2018-01-17 13:59:28 -05:00
jaebradley
3218f64326 implement upsell modal 
update css

updated css

make modal experimental

add waffle flag
 2018-01-17 11:26:57 -05:00
Saleem Latif
2ae02a6559 Update Registration/Signin Page to include static message 2018-01-17 13:07:27 +05:00
Diana Huang
7af52bf125 Add Learner Analytics dashboard. 
Add the back-end and front-end React app for Learner Analytics.
This was mostly authored by @AlasdairSwan and @dianakhuang.

LEARNER-3376
 2018-01-16 11:57:12 -05:00
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Robert Raposa
3afa83c0c4 Merge pull request #15598 from edx/andya/developer-doc-cleanups 
Improve documentation for the Open edX features
 2018-01-12 13:40:08 -05:00
Andy Armstrong
7c09ebb794 Improve documentation for the Open edX features 2018-01-12 10:52:07 -05:00
Jae Bradley
725d354463 Merge pull request #17128 from edx/jaebradley/LEARNER-3600-Upsell-Modal 
jaebradley/learner 3600 upsell modal
 2018-01-12 09:57:09 -05:00
jaebradley
4573b63018 implement modal and carousel 
wip

upsell modal css

remove unnecessary newline

accidentally removed feature

update props

update modal component

update css

add additional slides

update styling

update copy
 2018-01-12 01:35:15 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Matthew Piatetsky
222b356900 Fix course upsell styling when bootstrap is enabled 2018-01-09 16:09:26 -05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Nimisha Asthagiri
a37d09aefb Move PluginManager out of api folder 2018-01-08 19:15:23 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
asadiqbal
5d92b42fe3 UI Updates to Support Ent Data Synchronization 2018-01-05 17:16:02 +05:00
Matthew Piatetsky
57c45c6453 Merge pull request #16969 from edx/LEARNER-3058 
LEARNER-3058 Move hero upsell to sidebar
 2018-01-04 14:48:18 -05:00
Diana Huang
b4e7d35095 Mark sock strings for translation. 2018-01-04 09:34:14 -05:00
Matthew Piatetsky
277407f2a6 move course upsell 2018-01-03 13:51:55 -05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
christopher lee
02a98a7232 Use user's language preference on bookmark page 2017-12-29 13:11:00 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Waheed Ahmed
cd65d720ad Add save button with profile visibility dropdown. 
When a learner changes this dropdown from Full to Limited or
vice versa, nothing happens. This creates confusion, to fix
that add save button.

LEARNER-3239
 2017-12-15 13:03:33 +05:00
Douglas Hall
ada86232c2 ENT-798 Update SailThru user with enterprise name on EnterpriseCustomerUser creation. 2017-12-13 16:24:27 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -05:00
Asad Iqbal
14cb287ed0 Merge pull request #16665 from edx/asadiqbal08/ENT-751 
[ENT-751] Update the SailThru var with Enterprise learner information
 2017-12-05 15:03:08 +05:00
asadiqbal
390c5368db Update the SailThru var with Enterprise learner information 2017-12-04 22:33:56 +05:00
Waheed Ahmed
d7d310bc4f Course dates mobile fragment improvments. 
Added new mobile css entry in css pipline and removed
dates heading for mobile view.

LEARNER-3206
 2017-12-04 15:16:06 +05:00
Michael Terry
8570809cae Fix keyboard navigation in course outline 
Remove some obsolete and broken a11y markup that was causing
keyboard navigation in the main course outline to focus elements
that shouldn't be focused.

LEARNER-2893
 2017-11-27 16:48:08 -05:00
Michael Terry
20154a761c Merge pull request #16641 from mikix/mikix/button-a11y 
Fix focus loss when bookmarking a page in IE
 2017-11-27 12:13:06 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Michael Terry
96c737d1cb Fix focus loss when bookmarking a page in IE 
In IE, when a user presses the bookmark/remove-bookmark button,
the focus was lost on that button because we set disabled=true
while we do the operation. Set the focus back when we are done.

LEARNER-2896
 2017-11-21 11:16:48 -05:00
asadiqbal
e5c55a8945 ENT-729 2017-11-16 16:28:31 +05:00
Douglas Hall
4d58ee0b5e Merge pull request #16551 from edx/douglashall/add_enterprise_logging 
Added logging to help debug Enterprise API throttling issue.
 2017-11-14 13:03:02 -05:00
Douglas Hall
f3da3b241c Added logging to help debug Enterprise API issue. 2017-11-14 10:00:48 -05:00
bmedx
f3f8d8ec96 Changes necessary for Django 1.11 tests to start 
- Certificates management commands updates
- Moving reverse calls in tests into setUp from class definition
- Import shuffling
- Consolidating cryptograhpy version to 1.9
 2017-11-13 15:45:32 -05:00
Tasawer Nawaz
34d8b1fb16 Merge pull request #16515 from edx/tasawer/learner-3097/fix-certificates-visibility-on-profile-page 
Fix certificates visibility to students on the profile page before the available date
 2017-11-13 18:15:31 +05:00
Marco Morales
9fc58a25bd Merge pull request #16506 from edx/hrein/responsive-experience/cleanups 
Styling changes for responsive behavior on LMS.
 2017-11-09 14:47:28 -05:00
Harry Rein
aa853a930e Styling changes for responsive behavior on LMS. 2017-11-09 12:46:48 -05:00
John Eskew
80d70f6ecb Run all touched files through isort. 2017-11-09 09:25:19 -05:00
John Eskew
6672f64188 Add commerce AppConfig and use to register signals. Move imports. 
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
 2017-11-09 09:24:37 -05:00
Tasawer Nawaz
d2827b3d8e Fix certificates visiblity to students on the profile page before the issue date set by course teams 
LEARNER-3097
 2017-11-09 17:10:49 +05:00
Harry Rein
7091ed0f70 Merge pull request #16337 from edx/HarryRein/home-page-styling-fixes 
Course home page styling with bootstrap.
 2017-10-26 13:39:44 -04:00
Harry Rein
d4e93fc655 Course home page styling with bootstrap. 
Updates the new bootstrap course home page to match the old course home page.
 2017-10-26 09:25:58 -04:00