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

36187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wajeeha-khalid
c9bf6dc6b5 jia/MA-1815 retrieve count for child comments 2016-04-14 13:33:34 +05:00
Nimisha Asthagiri
198a46338e Merge pull request #12141 from edx/naa/fix-dashboard-safe 
Fix Dashboard on edx.org theme
 2016-04-13 17:21:37 -04:00
Nimisha Asthagiri
c73a238e57 Fix Dashboard on edx.org theme. 2016-04-13 17:11:53 -04:00
Renzo Lucioni
0279326d0c Merge pull request #12137 from mitocw/fix/aq/migration_003_issues 
Fixed course not found against ccx issue on migration 0003
 2016-04-13 13:27:02 -04:00
Amir Qayyum Khan
0d8237680c Fixed exception related to course not found for ccx 2016-04-13 21:48:12 +05:00
Renzo Lucioni
173154d1ca Merge pull request #12087 from edx/rc/2016-04-12 
Release Candidate rc/2016-04-12
 2016-04-12 19:55:56 -04:00
Matt Drayer
12661764c3 Merge pull request #12128 from edx/mattdrayer/revert-11319 
Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFind…
 2016-04-12 16:31:05 -04:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04:00
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming 
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
 2016-04-12 10:55:04 -04:00
Diana Huang
16ac76d00b Merge pull request #12121 from edx/diana/revert-final-check 
Revert "Make it impossible to click "final check" without selecting a…
 2016-04-12 10:15:18 -04:00
Toby Lawrence
c26c52e6ba Merge pull request #12120 from edx/revert/contentserver-instrumentation 
Revert "[PERF-274] Add NewRelic instrumentation to contentserver."
 2016-04-12 10:12:41 -04:00
Diana Huang
fa61c04894 Revert "Make it impossible to click "final check" without selecting a choice" 
This reverts commit 4c83a2f0de.
 2016-04-12 10:11:15 -04:00
Toby Lawrence
95fde6d527 Revert "[PERF-274] Add NewRelic instrumentation to contentserver." 
This reverts commit 09586d8a37.
 2016-04-12 10:05:18 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN 
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
 2016-04-11 15:34:29 -04:00
Nimisha Asthagiri
e343fbe99c Merge pull request #12115 from edx/naa/fix-dashboard-xss 
Fix dashboard safe template issues
 2016-04-11 13:08:34 -04:00
Nimisha Asthagiri
59b8bb54e3 Fix Dashboard safe template. 2016-04-11 12:23:22 -04:00
Nimisha Asthagiri
8e591f6323 Fix Safe template issues (again) 2016-04-11 12:23:11 -04:00
Clinton Blackburn
d6ba8839bf Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-11 12:20:37 -04:00
Douglas Hall
69db1e7432 Merge pull request #12113 from edx/douglashall/upgrade_xblock_lti_consumer 
Upgraded xblock-lti-consumer to 1.0.5
 2016-04-11 12:12:12 -04:00
Douglas Hall
2d3a034695 Upgraded xblock-lti-consumer to 1.0.5 2016-04-11 12:04:05 -04:00
Bill DeRusha
f51f7eab07 Merge pull request #12111 from edx/bderusha/revert-wiki-mako-changes 
Revert "Safe Templatize: wiki templates"
 2016-04-11 11:57:28 -04:00
Bill DeRusha
f4208e7c58 Revert "Safe Templatize: wiki templates" 
This reverts commit e6edba18b4.
 2016-04-11 11:53:52 -04:00
Brian Beggs
17d8fdb531 Merge pull request #12110 from edx/bbeggs/ccx-fix-MA-2258 
Fix sequence navigation issues for CCX courses
 2016-04-11 11:52:22 -04:00
Nimisha Asthagiri
7d43e3994c Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-11 11:46:12 -04:00
Feanil Patel
0173642f38 Merge pull request #12098 from edx/feanil/add_migration_dependency 
Update migration to add a dependency.
 2016-04-08 14:58:20 -04:00
Feanil Patel
3592819720 Update migration to add a dependency. 
Because this migration depends on enrollment code and that code relies on a new table.
 2016-04-08 14:51:53 -04:00
Brian Jacobel
15ea5ece47 Merge pull request #12089 from edx/revert-pattern-lib-css-changes 
Revert "Introduce Pattern Library test pages"
 2016-04-08 14:20:39 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 11:41:04 -04:00
Muzaffar yousaf
31ca2a637a Merge pull request #12041 from edx/mzfr/fixup-safe-templates 
Safe  template for edxnotes.
 2016-04-08 11:46:59 +05:00
Ron Mulero
b2a8fb771d Merge pull request #12080 from edx/ron/theme-work 
Add registerd trademarked logo to footer.
 2016-04-07 19:56:36 -04:00
Ron Mulero
12f8edc24f Add registerd trademarked logo to footer of edx.org and edge.edx.org. 2016-04-07 19:55:51 -04:00
Eric Fischer
141be63bea Merge pull request #12077 from edx/efischer/merge-release-to-master 
Efischer/merge release to master
 2016-04-07 15:45:13 -04:00
Eric Fischer
813b50aed2 Fix conflict, 1.1.3 is correct 2016-04-07 14:45:19 -04:00
Eric Fischer
ff2a939878 Merge pull request #12073 from edx/hotfix/2016-04-07 
Bump ora2 version
 2016-04-07 14:30:57 -04:00
clrux
0571103bdb Merge pull request #11369 from edx/clrux/ac-223 
AC-223 updating transcript skip links
 2016-04-07 13:23:02 -04:00
Adam
810a5a79d1 Merge pull request #12072 from edx/merge-release-into-master 
Merge release into master
 2016-04-07 13:16:18 -04:00
Eric Fischer
16d62e551b Bump ora2 version 2016-04-07 12:39:08 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
John Eskew
abba913bee Merge pull request #12053 from mitocw/fix/aq/ccx_creating_issue 
Fixed unable to created ccx issue
 2016-04-07 12:09:40 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Adam
3853538c5a Merge pull request #12059 from edx/patch/2015-04-06 
Patch/2015 04 06
 2016-04-07 11:58:00 -04:00
Matt Drayer
c7552db4d5 Merge pull request #11987 from edx/asadiqbal08/xblock_translations 
asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System
 2016-04-07 10:54:33 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
muzaffaryousaf
03c801255f Safe template for edxnotes. 2016-04-07 15:10:38 +05:00
Muzaffar yousaf
b9b87f9b46 Merge pull request #11949 from edx/fix-migrations 
Making migrations in-sync with models.
 2016-04-07 14:59:17 +05:00
muzaffaryousaf
2e0a9b2658 Bump version for edx/django-oauth2-provider that includes in-sync migrations. 
TNL-4296
 2016-04-07 12:26:18 +05:00
muzaffaryousaf
c3cd2db384 Moving choices to admin form instead of models. 
TNL-4296
 2016-04-07 12:26:18 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00