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

22621 Commits

Author SHA1 Message Date
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
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
Nimisha Asthagiri
7286c64e18 Refactor Django App Plugins to allow for additional features 2018-01-15 12:16:53 -05:00
Daniel Clemente Laboreo
4a2e6e31a6 Allow customizing heartbeat checks 2018-01-15 16:50:42 +01: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
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
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
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
Ahsan Ulhaq
3492eecd34 Added field description for accessibility 
In account settings page when language changes the page is refreshed
to apply changes. But user is not advised about this change before using
the field. So added description so user knows about reload beforehand.
LEARNER-3832
 2018-01-12 14:09:13 +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
Jesse Zoldak
dae4ece3ab Remove skipped testcases 2018-01-11 14:54:42 -05:00
Nimisha Asthagiri
4c67302604 Update grades app to be a Django App Plugin 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
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
Matt Tuchfarber
78bc871fa4 Merge pull request #17091 from open-craft/clemente/upstream-add-blocks-to-course-about 
Add some blocks to course_about.html
 2018-01-11 12:21:22 -05:00
mrey
a28f3046e1 Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values 2018-01-11 16:37:30 +01:00
Waheed Ahmed
69cd383402 Merge pull request #17145 from edx/waheed/LEARNER-3754-update-my-program-detail-url-for-mobile 
Update program detail fragment url for mobile apps.
 2018-01-11 12:42:23 +05:00
Jeremy Bowman
64b06b2259 Merge pull request #17155 from edx/jmbowman/PLAT-1881 
PLAT-1881 Fix datetimes lacking timezone information
 2018-01-10 18:00:10 -05:00
Tyler Hallada
804eacdb04 Use percentage widths to fix flex-box bug 2018-01-10 17:48:34 -05:00
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -05:00
Harry Rein
7f369b1ed9 Merge pull request #17151 from edx/HarryRein/initialize-currently-enrolled-for-entitlement-card 
Ensure entitlement session select initializes to enrolled session.
 2018-01-10 13:46:42 -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
Harry Rein
5dfd5213fd Ensure entitlement session select initializes to enrolled session. 
LEARNER-3827
 2018-01-10 12:13:56 -05:00
Matthew Piatetsky
c2094d4388 Merge pull request #17134 from edx/LEARNER-3058 
Fix course upsell styling when bootstrap is enabled
 2018-01-10 09:59:37 -05:00
Waheed Ahmed
2406812100 Update program detail fragment url for mobile apps. 
LEARNER-3754
 2018-01-10 19:01:04 +05:00
McKenzie Welter
2db8364646 Merge pull request #17123 from edx/McKenzieW/learner-3688 
updated flexbox for course actions
 2018-01-10 08:19:27 -05:00
ayub-khan
9650c324bc updated-translations 2018-01-10 15:53:41 +05:00
Matthew Piatetsky
222b356900 Fix course upsell styling when bootstrap is enabled 2018-01-09 16:09:26 -05:00
McKenzie Welter
b0271de359 make course actions an inline flexbox 2018-01-09 15:16:27 -05:00
Harry Rein
042a854bd0 Merge pull request #17124 from edx/HarryRein/dashboard-entitlement-with-no-course-runs 
Show more sessions coming soon on course dashboard.
 2018-01-09 14:13:33 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
Mushtaq Ali
5750495f86 Merge pull request #17052 from edx/show-transcripts-feature 
Show transcripts feature
 2018-01-09 19:29:47 +05:00
Zubair Afzal
dedbd288dc Merge pull request #17137 from edx/zub/ENT-768-display-friendly-error-message-for-third-party-auth 
ENT-768 Display friendly error message for third party auth error
 2018-01-09 19:25:50 +05:00