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

36161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
e0d
2be2b52f63 apply the setting to the CMS too 2016-04-08 06:09:03 -04:00
e0d
ae202dd54a fix CR nits 2016-04-08 06:08:41 -04:00
Edward Zarecor
f20f895903 Updating cookies settings 2016-04-08 06:00:31 -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
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +05:00
Robert Raposa
68ae132542 Merge pull request #12048 from edx/robrap/linter-revert-include 
TNL-4345: Remove include linting
 2016-04-06 20:35:01 -04:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Diana Huang
ec08b91e67 Merge pull request #12062 from edx/diana/ora-version-bump 
Bump ORA version.
 2016-04-06 16:50:45 -04:00
Ned Batchelder
530d61e678 Merge pull request #12063 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-06 16:41:15 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Diana Huang
efc1f9683e Bump ORA version. 2016-04-06 15:28:32 -04:00
Robert Raposa
a6ac06f210 Remove outdated safe template recommendations 
- Remove <%include> linting
- Remove dump_html_escaped_json
 2016-04-06 14:57:48 -04:00
Jesse Zoldak
6bfb94cd60 Merge pull request #12061 from edx/revert-11374-omar/verified-coursemode-price 
Revert "Disallow free verified course modes"
 2016-04-06 14:14:54 -04:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Awais Jibran
03925474b9 Verification Upgrade Deadline panel on course home page should not show if user is already verified 2016-04-06 12:53:31 -04:00
Awais Jibran
1799634c2e Fix certificate exception view. 
ECOM-3910
 2016-04-06 12:53:04 -04:00
Adam Palay
a254d7542a make sure email from addresses don't exceed 320 characters (TNL-4264) 
clean up and fix quality violations

since get_course can never return None, we can remove these lines
 2016-04-06 12:52:39 -04:00
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -04:00
Omar Khan
c5072d63ac Add azuread SSO button style 2016-04-06 12:51:07 -04:00
Omar Khan
07892a75f2 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-06 12:50:55 -04:00
Omar Khan
c09a4c472f Add --save_screenshots option to paver test_bokchoy 2016-04-06 12:50:43 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price 
Disallow free verified course modes
 2016-04-06 12:32:00 -04:00
asadiqbal
7ae40dced8 asadiqbal08/WL-388: ModuleI18nService for Descriptor System 
mattdrayer: Default to XBlock class if no unmixed class
 2016-04-06 11:53:14 -04:00
Toby Lawrence
fc149abf06 Merge pull request #12007 from edx/PERF-274 
[PERF-274] Add NewRelic instrumentation to contentserver.
 2016-04-06 11:43:08 -04:00
Toby Lawrence
09586d8a37 [PERF-274] Add NewRelic instrumentation to contentserver. 
This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.
 2016-04-06 10:31:02 -04:00
Douglas Hall
a9a330a0e4 Merge pull request #11021 from StraNNiKK/LTI-9 
LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack
 2016-04-06 10:10:15 -04:00
Waheed Ahmed
058a7e8478 Merge pull request #12036 from edx/waheed/ecom-3127-fix-grade-requirements 
Fixed progress page grade requirements text.
 2016-04-06 16:48:28 +05:00
Waheed Ahmed
6a9157e409 Fixed progress page grade requirements text. 
ECOM-3127
 2016-04-06 15:37:28 +05:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page 
Introduce Pattern Library test pages
 2016-04-05 15:36:11 -04:00
John Eskew
33568cb409 Merge pull request #11988 from mitocw/fix/aq/cas_profile_not_found_mitocw#102 
Fixed 500 error in case of user's profile not found when login/logout with CAS.
 2016-04-05 15:31:48 -04:00