Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,683 Commits 1 Branch 0 Tags
b46ce3a414a64d371a8a4dc2cdfdc6a39ec2a79f
Commit Graph

44683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
b46ce3a414 Merge pull request #17214 from edx/alasdair/LEARNER-3429-learner-analytics-dashboard-styles 
LEARNER-3429 Learner Analytics Dashboard Style updates
 2018-01-18 12:01:24 -05:00
Douglas Hall
0a27d62ee0 Merge pull request #17236 from edx/douglashall/enterprise_0_62_0 
Upgrade edx-enterprise package to 0.62.0.
 2018-01-18 11:48:16 -05:00
Douglas Hall
72f1c413d9 Upgrade edx-enterprise package to 0.62.0. 2018-01-18 10:29:31 -05:00
Saleem Latif
7858066776 Merge pull request #17230 from edx/saleem-latif/ENT-805-add-logging 
[ENT-805]: Add logging to better understanding why skip activation email is not working as expected.
 2018-01-18 19:41:36 +05:00
AlasdairSwan
9e92ba9845 LEARNER-3429 Learner Analytics Dashboard Style updates 2018-01-18 09:37:53 -05:00
Hasnain Naveed
3cf8aeab1f Merge pull request #17143 from edx/hasnain-naveed/WL-1395 
Changed the secret key for ecommerce and discovery clients.
 2018-01-18 15:25:00 +05:00
Douglas Hall
ffb01bb05e Merge pull request #17223 from edx/douglashall/ENT-851 
ENT-851 TPA Registry.get should return None if passed None.
 2018-01-18 04:54:29 -05:00
Saleem Latif
06b6c1c50d Add logging to better understanding why skip activation email is not working as expected. 2018-01-18 14:22:53 +05:00
Noraiz Anwar
9de58fa100 Merge pull request #17165 from edx/noraiz/EDUCATOR-1994 
auto certs for professional and no-id-professional enrollment modes
 2018-01-18 12:52:05 +05:00
Uzair Rasheed
74c8497b9b Merge pull request #17199 from edx/LEARNER-3812/dashboard-url 
Append dashboard url with slash to improve user experience
 2018-01-18 12:34:17 +05:00
noraiz-anwar
698a041ee8 auto certs for non-verfied enrollment modes 2018-01-18 11:43:16 +05:00
Matthew Piatetsky
92c6945fe2 Merge pull request #17226 from edx/debug_bundles_dashboard 
add additional info to dom for debugging purposes
 2018-01-17 17:59:52 -05:00
Tyler Hallada
57bcc55cdc Merge pull request #17207 from edx/thallada/fullpage-sfe 
EDUCATOR-2067 If SFE enabled, hide sidebar and upload button
 2018-01-17 17:32:58 -05:00
Matthew Piatetsky
76a4ddef57 add additional info to dom for debugging purposes 2018-01-17 16:03:59 -05:00
Ari Rizzitano
13f0e6a63a Merge pull request #17121 from edx/ari/frontend-docs 
first pass JS and Bootstrap docs
 2018-01-17 15:35:33 -05:00
Tyler Hallada
a0700a6484 Upgrade SFE to 0.8.3 2018-01-17 15:35:23 -05:00
Tyler Hallada
9ee82fd872 Upgrade SFE to 0.8.2 2018-01-17 15:35:02 -05:00
Tyler Hallada
8dcba2737a If SFE enabled, hide sidebar and upload button 2018-01-17 15:34:02 -05:00
Dillon-Dumesnil
e368fd62b0 Merge pull request #17215 from edx/add-8_370 
Adding in 8.370 to review Xblock
 2018-01-17 15:34:00 -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
Jae Bradley
5a13f4c7e1 Merge pull request #17191 from edx/learner-3600-upsell-modal 
LEARNER-3584 - Implement Upsell Modal for Learner Analytics Test
 2018-01-17 14:45:41 -05:00
Ayub khan
6dbf3d46b9 Merge pull request #17218 from edx/17-jan-update-translations 
update translations
 2018-01-18 00:30:52 +05:00
George Babey
63b60c9c8a Merge pull request #17153 from edx/gbabey/ENT-763 
Add util method for localizing catalog pricing
 2018-01-17 14:25:41 -05:00
Gregory Martin
61ac515e52 Merge pull request #17222 from edx/yro/updated_devstack_req 
Add empty npmignore file
 2018-01-17 14:18:06 -05:00
Robert Raposa
740be6b304 Disable Learner Analytics for non-verified users. 2018-01-17 13:59:28 -05:00
Douglas Hall
f0341e5d29 ENT-851 TPA Registry.get should return None if passed None. 2018-01-17 13:55:56 -05:00
Dillon Dumesnil
dca03eefb9 Adding in 8.370 to review Xblock 2018-01-17 13:15:13 -05:00
Nimisha Asthagiri
be79010abe Merge pull request #16638 from proversity-org/proversity/edx-pr-display-correct-course-info-on-intructor-dashboard 
Show correct course info on instructor dashboard
 2018-01-17 13:11:08 -05:00
Jeremy Bowman
529e03bb24 Merge pull request #17220 from edx/jmbowman/ccx_naive_datetimes 
Fix naive datetime warnings in CCX view tests
 2018-01-17 12:59:54 -05:00
Gregory Martin
bae635e68b Add empty npmignore file, override gitignore for NPM deps. 2018-01-17 12:50:36 -05:00
George Babey
9934b648b6 Add util method for localizing catalog pricing 2018-01-17 12:44:01 -05:00
Jeff LaJoie
8623d6e96b Merge pull request #17149 from edx/jlajoie/LEARNER-3661 
LEARNER-3661: Removes sessions a user has already claimed
 2018-01-17 11:46:20 -05:00
Jeremy Bowman
8ca9fdeee3 Fix naive datetime warnings in CCX view tests 2018-01-17 11:43:24 -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
Jeff LaJoie
ed1d33e547 LEARNER-3661: Removes sessions a user has already claimed an entitlement for from list of available sessions 2018-01-17 09:40:04 -05:00
ayub-khan
5033dbcd91 update translations 2018-01-17 19:26:02 +05:00
uzairr
2ed7be94f7 Append dashboard url with slash to improve user experience 
The Dashboard url in LMS is only accessible in the absence of
slash at its end.To improve the user experience its URL is
updated.

LEARNER-3812
 2018-01-17 15:39:29 +05:00
Saleem Latif
f78d5d2de6 Merge pull request #17200 from edx/saleem-latif/ENT-576 
ENT-576: Update Registration/Signin Page to include static message
 2018-01-17 15:38:30 +05:00
Waheed Ahmed
78f5b102ca Merge pull request #17163 from edx/waheed/LEARNER-3755-update-program-detail-fragment 
Update program detail fragment.
 2018-01-17 15:05:29 +05:00
Waheed Ahmed
c68b50d964 Update program detail fragment. 
LEARNER-3755
 2018-01-17 13:48:33 +05:00
Jose Antonio Gonzalez
53242fdad3 show correct course info on instructor dashboard 2018-01-17 10:15:05 +02:00
Saleem Latif
2ae02a6559 Update Registration/Signin Page to include static message 2018-01-17 13:07:27 +05:00
Ahsan Ul Haq
6215945b6f Merge pull request #17174 from edx/ahsan/LEARNER-3832-account-settings-accessibility-issue 
Added field description for accessibility
 2018-01-17 12:49:03 +05:00
Ari Rizzitano
699683f3f7 Merge pull request #17213 from edx/ari/npm-pin-latest 
bump all npm packages to latest and pin
 2018-01-16 16:37:06 -05:00
Ari Rizzitano
0e4097eb33 bump all npm packages to latest and pin 2018-01-16 15:14:13 -05:00
Stu Young
555d127045 Merge pull request #17206 from edx/estute/run-unittests-without-coverage 
paver flag to run unittests without coverage
 2018-01-16 14:21:49 -05:00
Robert Raposa
75e371ec00 Merge pull request #17204 from edx/robrap/LEARNER-3376-Learner-Analytics-Dashboard-app-squash-rebase 
LEARNER-3376: Add Learner Analytics dashboard. (Squash + Rebase)
 2018-01-16 13:08:33 -05:00
Jesse Zoldak
7a57760b1e Merge pull request #17202 from edx/zoldak/clean-up-scripts-folder 
Remove obsolete files
 2018-01-16 12:09:22 -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
Stuart Young
078f3e6be4 paver flag to run unittests without coverage 2018-01-16 11:30:20 -05:00