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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Saleem Latif
7a1b8aec5d Remove stanford_theme_enabled from themes templates 2016-01-27 14:56:50 +05:00
Awais Jibran
0f2f1f2c17 Add logging when user is removed from exception list 
ECOM-3525
 2016-01-27 14:48:29 +05:00
Ahsan Ulhaq
7c8de429d9 Merge pull request #11337 from edx/ahsan/Update-edx-organizations-version 
Add latest edx-organization version in the platform
 2016-01-27 14:14:11 +05:00
Awais Jibran
793f916712 TNL-4049 
Specific user cannot access studio.edge.edx.org/home
 2016-01-27 14:12:26 +05:00
Ahsan Ulhaq
18c1f86a67 Add latest edx-organization version in the platform 2016-01-27 13:27:46 +05:00
Clinton Blackburn
aed41b1556 Merge pull request #11332 from edx/clintonb/opaque-keys-update 
Installing edx-opaque-keys from PyPI
 2016-01-26 21:57:54 -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
Cliff Dyer
44e4569d49 Merge pull request #11343 from edx/cdyer/derped-oauth-settings 
Call dict.get properly in settings.
 2016-01-26 16:51:07 -05:00
Douglas Hall
8bc41cb3e2 Upgrade xblock_lti_consumer to pull in responsive modal launch improvements 2016-01-26 16:43:56 -05:00
J. Cliff Dyer
9798d2e1db Call dict.get properly in settings. 2016-01-26 21:39:29 +00:00
Clinton Blackburn
341d00dbcd Installing edx-opaque-keys from PyPI 
The package formerly known as opaque-keys now lives on PyPI as edx-opaque-keys. Additionally, the zendesk requirement has been moved to the correct location.
 2016-01-26 15:46:40 -05:00
Nimisha Asthagiri
3a6fbae60c Reorder transformers to fix MA-1981. 2016-01-26 15:46:15 -05:00
Eric Fischer
7d773df52d Merge pull request #11171 from edx/andya/fix-discussion-more-icons 
Fix bug with discussion response "More..." actions
 2016-01-26 15:08:41 -05:00
Adam
fa74b9f139 Merge pull request #11339 from edx/merge-release-into-master 
Merge release into master
 2016-01-26 15:00:38 -05:00
Bill DeRusha
77668afa11 Update age calculation to be more conservative. 2016-01-26 13:19:51 -05:00
jsa
46638d7f75 fix reference to reverted test method. 2016-01-26 13:18:00 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily 
It is unneeded here, and causes bad behavior.
 2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates 
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
 2016-01-26 13:08:42 -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
Adam
55b7fa4924 Merge pull request #11309 from edx/rc/2016-01-26 
Release Candidate rc/2016-01-26
 2016-01-26 11:12:19 -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
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -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
Cliff Dyer
f0908249ca Merge pull request #11301 from edx/cdyer/exif-rotation 
Preserve EXIF orientation data for profile images. (MA-1559)
 2016-01-25 15:27:17 -05:00
Jesse Zoldak
d6b258fdeb Merge pull request #11265 from edx/zoldak/bok-choy-clean 
Do not clean test files with bok choy testsonly command
 2016-01-25 15:25:03 -05:00
Adam Palay
46066c04af resolve quality violation 2016-01-25 15:04:19 -05:00
Adam
d7c154d923 Merge pull request #11328 from edx/revert-migration-rc 
Revert migration rc
 2016-01-25 14:23:29 -05:00
J. Cliff Dyer
2b6ae74885 fixup: dedupe test code. 2016-01-25 19:22:58 +00: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
Ben Patterson
fb9f818445 Merge pull request #11327 from edx/benp/fix-builds-jan2016 
edx-user-state-client is still needed.
 2016-01-25 13:14:34 -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
Adam Palay
6b937a8db3 Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" 
This reverts commit 0d1765e190, reversing
changes made to d2eaa63353.
 2016-01-25 12:45:50 -05:00
Adam Palay
c9c8116da7 Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms" 
This reverts commit a84b81113b, reversing
changes made to 0d1765e190.
 2016-01-25 12:45:07 -05:00
Ben Patterson
9a23bb6050 edx-user-state-client is still needed. 2016-01-25 12:08:15 -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
Ahsan Ulhaq
a84b81113b Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms 
Ahsan/rc add service user in cms
 2016-01-25 21:00:23 +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
d5a96ee0ff Preserve EXIF orientation data for profile images. 
When creating profile images from an uploaded file, ensure that EXIF
orientation information is preserved, so profile images appear
right-side-up.

https://openedx.atlassian.net/browse/MA-1559
 2016-01-25 15:23:23 +00:00
Ahsan Ulhaq
31ec8ef708 Add service username in cms settings 2016-01-25 20:04:10 +05:00
Matjaz Gregoric
9b89bd3245 Make comprehensive theme work with django templates. 
Comprehensive theming did not work with django templates (used by course wiki).

The reason it didn't work was that in order for the theme to work, theme template folder
has to be added to django template dirs setting *before* django startup.
After django startup, modifying `settings.DEFAULT_TEMPLATE_ENGINE['DIRS']` has no effect,
because at that point the template engine is already initialized with a copy of the
template dirs list.

Instead of running the theme startup code as an autostartup hook, we manually run it
*before* `django.setup()`. This is fine because theme startup code doesn't have to do
anything else besides modifying some settings and doesn't actually need django to be
initialized.
 2016-01-25 08:45:52 +01:00
M. Rehan
8c26178df3 Merge pull request #11095 from edx/mushtaq/improve_get_item 
Get only those block items which have their path to root
 2016-01-23 02:50:25 +05:00