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

44661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jeremy Bowman
7e2a231098 Merge pull request #16957 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2018-01-16 10:58:29 -05:00
Jesse Zoldak
faf795749f Remove obsolete files 2018-01-16 09:59:48 -05:00
Albert (AJ) St. Aubin
5553e7ddf1 Merge pull request #17172 from edx/aj/LEARNER-3708 
Changes the Program Details page to show the most recently purchased
 2018-01-16 08:28:37 -05:00
Jeremy Bowman
7d436a18ee PLAT-1858 Better capture of deprecation warnings 2018-01-12 18:04:32 -05:00
Jeremy Bowman
dba976fc16 Merge pull request #17180 from edx/jmbowman/PLAT-1885 
PLAT-1885 Stop using deprecated BlockUsageLocator properties
 2018-01-12 18:02:29 -05:00
Nimisha Asthagiri
f841d65b93 Merge pull request #17176 from edx/arch/oauth-scopes-ux 
OAuth: support for auto_even_if_expired REQUEST_APPROVAL_PROMPT
 2018-01-12 17:32:43 -05:00
Troy Sankey
e19f51dbff Merge pull request #16918 from edx/pwnage101/collectstatic_works_for_1.11 
LMS collectstatic now runs under Django 1.11
 2018-01-12 17:14:59 -05:00
Jeremy Bowman
113e8dde61 PLAT-1885 Stop using deprecated BlockUsageLocator properties 2018-01-12 16:40:21 -05:00
Tyler Hallada
7b40f86638 Merge pull request #17185 from edx/thallada/babel-polyfill 
Add babel-polyfill to fix IE11 bug
 2018-01-12 16:37:49 -05:00
Nimisha Asthagiri
ea041700f6 OAuth: support for auto_even_if_expired REQUEST_APPROVAL_PROMPT 2018-01-12 16:15:09 -05:00
Nimisha Asthagiri
a459daadb6 OAuth: update text for profile, email scopes as shown to SSO users 2018-01-12 16:15:08 -05:00
Michael Youngstrom
c3abe79b09 Merge pull request #17182 from edx/revert-17128-jaebradley/LEARNER-3600-Upsell-Modal 
Revert "jaebradley/learner 3600 upsell modal"
 2018-01-12 15:55:07 -05:00
Troy Sankey
e9e786b9af LMS collectstatic now runs under Django 1.11 
* Avoid URL namespace collision for "wiki:*" by changing the
  course-specific django-wiki instance/app name to something we will
  never reverse.

* Update our custom implementation of the staticfiles app's
  CachedFilesMixin internal methods `url_converter()` and `_url()` to be
  compatible with Django 1.11.  This installs multiple shims in order to
  maintain compatibility with previous django versions.
 2018-01-12 15:54:21 -05:00
Jesse Zoldak
ee3f792eed Merge pull request #17171 from edx/zoldak/remove-skipped-test-with-pylint-errors 
Remove skipped testcases
 2018-01-12 15:52:11 -05:00
Tyler Hallada
9ec5f4d09d Add babel-polyfill to fix IE11 bug 
ReactRenderer used Object.assign which is an ES 2015 feature that is not
supported by IE11. babel-polyfill will now polyfills that function for browsers
that do not support it before ReactRenderer tries to use it.
 2018-01-12 15:32:10 -05:00
Albert St. Aubin
2e99ee0d7f Changes the Program Details page to show the most recently purchased 
entitlement data

[LEARNER-3708]
 2018-01-12 15:03:25 -05:00
Michael Youngstrom
3b5fb67740 Remove accidental commit 2018-01-12 14:52:08 -05:00
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Michael Youngstrom
0d76e40e00 dummy test 2018-01-12 14:47:38 -05:00