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

44632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tyler Hallada
7a6db19a18 Merge pull request #17159 from edx/thallada/fix-discussion-off-screen-bug 
Use percentage widths to fix flex-box bug
 2018-01-12 13:33:37 -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
Zubair Afzal
6603717a42 Merge pull request #17175 from edx/zub/ENT-678-fix-enterprise-logo-stretching 
ENT-678 Fix enterprise logo stretching in enterprise sidebar
 2018-01-12 17:44:06 +05:00
Mushtaq Ali
cc83e7861e Merge pull request #17122 from edx/mrehan/delete-transcripts 
Delete transcript
 2018-01-12 16:30:31 +05:00
zubair-arbi
72068213e1 ENT-678 Fix enterprise logo stretching in enterprise sidebar 2018-01-12 15:55:28 +05:00
Mushtaq Ali
6af1215bcd Add delete js tests 2018-01-12 15:25:00 +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
Jeremy Bowman
c24d8c1b28 Merge pull request #17167 from edx/jmbowman/PLAT-1884 
PLAT-1884 Replace deprecated xblock.fragment usage
 2018-01-11 16:25:13 -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
Harry Rein
f747493c33 Merge pull request #17168 from edx/HarryRein/LEARNER-3734-chronological-session-selection 
Sort available sessions by start date.
 2018-01-11 15:34:14 -05:00
Brittney Exline
2fab772ea4 Merge pull request #17150 from edx/bexline/fix_enterprise_usernames 
ENT-838 Management command to change an enterprise user's username
 2018-01-11 12:54:53 -07:00
Jesse Zoldak
dae4ece3ab Remove skipped testcases 2018-01-11 14:54:42 -05:00
Nimisha Asthagiri
c5afde2d76 Quiet quality 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
306ec1f9f0 Update theming app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
93c6a89bd6 Update schedules app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
4c67302604 Update grades app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
f16bfac88b Update ace_common app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
70164ff978 Update setup.py with few Django App Plugins 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
7490cd93ab Enable Django App Plugins in LMS 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
24d6c314ef Enable Django App Plugins in CMS 2018-01-11 14:35:06 -05:00
Nimisha Asthagiri
c2fc546db9 Support for Django App Plugins 2018-01-11 14:35:06 -05:00
Nimisha Asthagiri
11794c8384 Rename schedules/docs/img to schedules/docs/images 2018-01-11 14:35:05 -05:00
Nimisha Asthagiri
dc3510a619 README docs for lms/envs directory 2018-01-11 14:35:05 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Ned Batchelder
58d23e4159 Merge pull request #17166 from mreyk/teltek/feature/allow-cert-name-aws-override 
Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values
 2018-01-11 13:19:14 -05:00
Harry Rein
287a00ee77 Sort available sessions by start date. 
LEARNER-3734
 2018-01-11 12:34:46 -05:00