Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 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
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
David Ormsbee
dbee08c721 Make Capa problems do initial load without AJAX. 
Before this commit, calling the student_view on a capa problem would
cause it to render an empty placeholder <div>, wait for the
DOMContentLoaded event to be fired, and then make AJAX requests to the
the problem_get handlers to retrieve the HTML it needed to render the
actual problems. This can significantly increase the end user load
times for pages, particularly when there are many problems in a
vertical.

This commit takes a very conservative approach and has the server side
add the rendered HTML into a new data-content attribute on the <div>
enclosing the problem. When Capa's JS initialization runs, it grabs
from that data-content attribute rather than reaching over the network
for an AJAX request.

I had attempted to make it somewhat smarter and push the rendered
problem straight into the document instead of relying on the
data-content attribute. This was faster, and should be our long term
goal. However, it caused odd bugs, particularly around MathJAX
rendering, and I never quite tracked the issue down. I'm still going
forward with these changes because it's significantly better than the
current situation that students have to deal with, and we can make the
JS more performant in a future iteration.

[PERF-261]
 2016-04-06 18:08:14 +05: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
wajeeha-khalid
18956af053 jia/MA-1815 retrieve count for child comments 2016-04-06 13:51:22 +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
Renzo Lucioni
05b8a77afe Merge pull request #12046 from edx/release 
Merge release into master
 2016-04-05 15:13:32 -04:00
Renzo Lucioni
0fd06e808a Merge pull request #12040 from edx/patch/2016-04-05 
Patch/2016 04 05
 2016-04-05 14:15:48 -04:00
John Eskew
fc1669734a Merge pull request #11947 from mitocw/fix/aq/max_enrollments_and_staff 
Excluded admins, staff and coach of master course from max enrollment
 2016-04-05 14:01:59 -04:00
Amir Qayyum Khan
9220c4d8dd Fixed 500 error in case of user's profile not found when login/logout with CAS 2016-04-05 22:49:05 +05:00
Peter Fogg
847618c761 Merge pull request #12031 from edx/rc-merge-test 
Merge RC back into master.
 2016-04-05 12:48:46 -04:00
Amir Qayyum Khan
58bde7f301 Excluded admins, staff and coach of master course from max enrollment 2016-04-05 21:31:54 +05:00
Kevin Falcone
905d18638b Allow migrations to run if CCX is enabled 
Without this, when CCX runs 0003 it'll invoke course_overviews while
loading a course, but that table has a model change, and the migration
has not run yet.  This ensures the course_overviews migration happens
first.
 2016-04-05 11:47:55 -04:00
Christina Roberts
d9ad47c901 Merge pull request #12026 from edx/christina/verified-track-cohort 
Automatic cohorting of verified track learners
 2016-04-05 11:12:15 -04:00
muzaffaryousaf
cc7aa349a1 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-05 10:21:25 -04:00
cahrens
18d0161556 Automaticaly move learners to verified cohort. 
TNL-4281.
 2016-04-05 10:12:03 -04:00
Simon Chen
b5b7ea7884 Create the listing page of Programs (x-series) which learners have enrolled in 2016-04-05 10:10:19 -04:00
Nimisha Asthagiri
7639d6c3e5 Merge pull request #12032 from edx/nasthagiri/fixup-safe-template 
Fix safe template change on dashboard
 2016-04-05 09:44:26 -04:00