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

17637 Commits

Author SHA1 Message Date
Rabia Iftikhar
dfdf1a4ad3 Merge pull request #17068 from edx/ri/EDUCATOR-2016-suspicious-proctored-exams 
EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious
 2018-01-19 22:54:19 +05:00
Jeremy Bowman
67f4907ef2 Merge pull request #17243 from edx/jmbowman/PLAT-1889 
PLAT-1889 Fix URL config and reversal issues
 2018-01-19 12:50:16 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
rabia23
222794ee59 EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious 2018-01-19 16:50:16 +00:00
Jeremy Bowman
ca84751bbd PLAT-1889 Fix URL config and reversal issues 2018-01-19 11:02:06 -05:00
Awais Jibran
1114e4334a Merge pull request #17224 from edx/aj/staff-override-score-fix 
Fix staff override score
 2018-01-19 15:00:39 +05:00
Awais Jibran
0016d6284d Fix staff override score 
If a learner has not accessed/attempted the score override functionality
didn't work. This PR is intended to fix this behaviour and the
override should work regardless of learner has accessed or attempted
a problem or not.
 2018-01-19 00:15: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
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -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
AlasdairSwan
9e92ba9845 LEARNER-3429 Learner Analytics Dashboard Style updates 2018-01-18 09:37: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
Matthew Piatetsky
76a4ddef57 add additional info to dom for debugging purposes 2018-01-17 16:03:59 -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
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
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
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
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
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
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