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

13250 Commits

Author SHA1 Message Date
Ahsan Ulhaq
b11e312d2c Create placeholder django apps for credentials 
ECOM-3057
 2016-01-28 13:05:49 +05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Giovanni Di Milia
e63194c1cd Added CCX REST APIs 
CCX REST APIs
OAUTH2 authorization for CCX APIs
- oauth2 authorization required for ccx list.
- Course-instructor permission for ccx api endpoint
- Protection for detail view too.

Tests for CCX REST APIs and OAUTH2 authorization
 2016-01-27 11:04:28 -05:00
Christine Lytwynec
9378c8ff28 Merge pull request #11245 from edx/clytwynec/tnl-4040 
Fix file upload in IE
 2016-01-27 09:44:11 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251 
Add the basis of configuring a cache TTL for course assets.
 2016-01-27 08:38:16 -05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets. 
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
 2016-01-26 21:09:18 -05:00
Nimisha Asthagiri
e76e05fa77 Specially handle login redirect for mobile apps 2016-01-26 17:23:04 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
J. Cliff Dyer
9798d2e1db Call dict.get properly in settings. 2016-01-26 21:39:29 +00:00
Nimisha Asthagiri
3a6fbae60c Reorder transformers to fix MA-1981. 2016-01-26 15:46:15 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Cliff Dyer
40ff300efd Merge pull request #11237 from edx/cdyer/custom-oauth-expires 
Create hooks to customize OAuth2 token lifetimes.
 2016-01-26 10:05:13 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287 
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
 2016-01-25 22:27:25 -05:00
David Ormsbee
e851db58fe Merge pull request #11325 from edx/ormsbee/remove_old_sass 
Remove unused scss files.
 2016-01-25 17:13:45 -05:00
Jim Abramson
a48b8b27bf Merge pull request #11318 from edx/jsa/ecom-3523 
Add COURSE_CERT_AWARDED signal and celery task stub
 2016-01-25 14:10:49 -05:00
Diana Huang
640b5d31f4 Merge pull request #10699 from doganov/TNL-3644 
Fixes TNL-3664 by collapsing actions dropdown after an action item is clicked.
 2016-01-25 13:43:24 -05:00
Adam Palay
cfab793cd3 Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" 
This reverts commit 8bc8b6cafd, reversing
changes made to c2255ef0d6.
 2016-01-25 13:36:26 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
J. Cliff Dyer
2c2f5e3b46 Improve local settings variable name. 2016-01-25 16:25:56 +00:00
David Ormsbee
2904da0e2e Remove unused scss files. 
We have some Sass files that basically generate duplicates of other
Sass files and are no longer referenced from any pages. This looks
like it might have been stuff that never got cleaned up when
comprehensive themeing was done.

List of removed files and what they were replaced by:

    application.scss ->  lms-main.scss
    application-rtl.scss -> lms-main-rtl.scss
    course.scss -> lms-course.scss
    course-rtl.scss -> lms-course-rtl.scss

This should help speed up the Sass compile.
 2016-01-25 11:20:54 -05:00
jsa
56d3fa011d use COURSE_CERT_AWARDED signal for milestones + badges 2016-01-25 10:54:37 -05:00
jsa
9d141ae7a1 Add config switch + signal for generating program certs. 
ECOM-3523
 2016-01-25 10:54:28 -05:00
J. Cliff Dyer
a975f59850 fixup: rework settings structure. 2016-01-22 20:42:15 +00:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates 
* mattdrayer: Updated get_themed_template_path
 2016-01-22 14:27:58 -05:00
Douglas Hall
8e22e855cb Merge pull request #11274 from edx/ibrahimahmed443/enable-copyright-url 
uncomment copyright url to enable it in microsites
 2016-01-22 13:37:12 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ahsan Ulhaq
8bc8b6cafd Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api 
Update edx-organization version and organization URL
 2016-01-22 20:26:00 +05:00
Ibrahim
bf272733ac uncomment copyright url to enable it in microsites 2016-01-22 10:02:07 -05:00
Ahsan Ulhaq
4f94b50cf2 Update edx-organization version and organization URl 
ECOM-3486
 2016-01-22 19:35:59 +05:00
Awais Jibran
c2255ef0d6 Merge pull request #11226 from edx/aj/ecom3384-course-image-breaking 
Studio - Schedule & Details tab broken
 2016-01-22 18:56:15 +05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms 
ECOM-3384
 2016-01-22 16:49:57 +05:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS 
ECOM-3419
 2016-01-22 13:00:36 +05:00
Chris Rodriguez
a0a9617a86 Replacing height and width in lieu of word-wrap 2016-01-21 15:18:05 -05:00
Ned Batchelder
7c9a65d8ce Merge pull request #11260 from eduNEXT/Bound3R/minwidth_layout 
Replace property min-width value
 2016-01-21 13:57:22 -05:00
Chris Rodriguez
33f967c04b Adjusting .sr mixins for NVDA/JAWS on Windows 2016-01-21 12:42:58 -05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release 
Release
 2016-01-21 12:36:03 -05:00
Daniel Naranjo
a639846a26 Reemplace property min-width value 
The min-width property accept only values <length> | <percentage> | inherit. to reset better set to 0.
Properties documentation: https://www.w3.org/TR/CSS2/visudet.html#min-max-widths

This error generates an invalid style, and, therefore, this value is set to 760px by: https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L50
 2016-01-21 09:50:35 -05:00
Syed Hasan raza
fb8478b084 Merge pull request #11228 from edx/shr/bug/AN-4509-HTTP_USER_AGENT 
Fix HTTP_USER_AGENT latin1 characters
 2016-01-21 15:23:16 +05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master 
Allow each instance to configure restrictions on allowed email addresses
 2016-01-20 14:51:29 -08:00
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128 
Added CCXCon app and CCXCon URL in course advanced settings
 2016-01-20 14:28:48 -05:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization 
Fix (un)enrollment email default language
 2016-01-20 13:15:30 -05:00
Régis Behmo
5fee7480e9 Fix (un)enrollment email default language 
When one or many users are sent an enrollment or unenrollment email via
the teacher subscription form, the emails are written in the user
language. If the user has no preferred language, e.g: when the user does
not exist, the platform language is supposed to be selected. In
practice, the emails were not being translated at all.
 2016-01-20 17:30:43 +01:00
Giovanni Di Milia
bb36ab013f Added CCXCon app 
The CCXCon app is used to push course updated to the CCXCon
 externale service.
 2016-01-20 10:47:37 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00