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

44702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
24e4f2fa63 Merge pull request #17244 from edx/try_bundling_test_fix 
Add some more data for debugging bundling test and try potential fix
 2018-01-18 23:52:08 -05:00
Matthew Piatetsky
0065e3c81e Add some more data for debugging bundling test and try potential fix 2018-01-18 18:03:14 -05:00
Matthew Piatetsky
a5b5a56b88 Merge pull request #17229 from edx/jaebradley/add_modal 
add modal
 2018-01-18 18:02:23 -05:00
Jeremy Bowman
bcc8ae6a78 Merge pull request #17187 from edx/jmbowman/PLAT-1831 
PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs
 2018-01-18 16:31:28 -05:00
Farhanah Sheets
053ca84c92 Merge pull request #17241 from edx/fsheets/EDUCATOR-2079 
SFE Version bump
 2018-01-18 15:57:18 -05:00
Albert (AJ) St. Aubin
dfe149b5ff Merge pull request #17234 from edx/aj/pagination_update_entitlements 
Increased the page size for the entitlements API
 2018-01-18 14:38:23 -05:00
Robert Raposa
aaafa9cde9 Merge pull request #17235 from edx/robrap/LEARNER-3905-add-staff 
LEARNER-3905: Enable Learner Analytics for staff users.
 2018-01-18 14:03:10 -05:00
Matthew Piatetsky
ba9b15e10b Add modal to track selection and dashboard 
add waffle flag
 2018-01-18 13:52:26 -05:00
Jeremy Bowman
8513945229 PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs 2018-01-18 13:44:34 -05:00
Nimisha Asthagiri
a5c5325a27 Merge pull request #17196 from edx/arch/plugin-signals-support 
Django App Plugins: support for Signal Receivers
 2018-01-18 13:23:18 -05:00
Farhanah Sheets
61ade535d2 SFE Version bump 2018-01-18 13:05:49 -05:00
Jae Bradley
905d258ca9 Merge pull request #17233 from edx/update-sfe-in-lock-file 
update package-lock file
 2018-01-18 12:25:47 -05:00
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
Nimisha Asthagiri
5430b3633f Move COURSE_START_DATE_CHANGED signal 2018-01-18 11:48:24 -05:00
Nimisha Asthagiri
2d28d2ce9e Update Schedules to use Plugin Signals 2018-01-18 11:48: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
Nimisha Asthagiri
1fe74c889c Django App Plugins: Support for Signal Receivers 2018-01-18 11:47:30 -05:00
Douglas Hall
72f1c413d9 Upgrade edx-enterprise package to 0.62.0. 2018-01-18 10:29:31 -05:00
Robert Raposa
121a2dda9e Enable Learner Analytics for staff users. 
LEARNER-3905
 2018-01-18 10:22:42 -05:00
Albert St. Aubin
e23def673b Increased the page size for the entitlements API 2018-01-18 10:19:55 -05:00
jaebradley
8736507ff6 update package-lock file 2018-01-18 09:52:52 -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