Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,970 Commits 1 Branch 0 Tags
455e0749e2dd9f01be4d47d06bf23dbf63c8e1c8
Commit Graph

38970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sanfordstudent
455e0749e2 Merge pull request #13720 from edx/sstudent/TNL-5697 
Updating logging for TNL-5697
 2016-10-14 13:12:27 -04:00
Christina Roberts
c8a3367269 Merge pull request #13705 from edx/christina/javascript_loader 
Christina/javascript loader
 2016-10-14 12:57:19 -04:00
alisan617
21eb03e116 Merge pull request #13513 from edx/alisan/inline-discussion-TNL-4756 
New inline discussion home view TNL-4756
 2016-10-14 12:09:42 -04:00
Ben Patterson
8772df0435 Merge pull request #13756 from edx/benp/flaky-textbook-tests 
Stabilize textbook tests
 2016-10-14 11:03:31 -04:00
Ned Batchelder
adbe8afbd8 Merge pull request #13744 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-14 11:02:17 -04:00
alisan617
d5635cf1ba New inline discussion home view UI 
TNL-4756
 2016-10-14 10:54:50 -04:00
Ned Batchelder
eaa0989c6a Update translations (autogenerated message) 2016-10-14 10:14:17 -04:00
Ben Patterson
b34600f140 Stabilize textbook tests 2016-10-14 10:05:49 -04:00
Sanford Student
b706fb461a updating grades logging 
for TNL-5697
 2016-10-14 09:26:52 -04:00
Clinton Blackburn
4acca4b1e2 Merge pull request #13755 from Microsoft/cdodge/restricted-oauth2-applications 
Cdodge/restricted oauth2 applications
 2016-10-14 08:38:10 -04:00
chrisndodge
6d327594ac add restricted DOT OAUTH2 client with reduced privileges 2016-10-14 07:31:26 -04:00
Jillian Vogel
1a8a1274d8 Merge pull request #13534 from open-craft/jill/choice_response_computed 
Allows ChoiceResponse problems to set correctness with python variables
 2016-10-14 17:55:12 +10:30
Jillian Vogel
8124aacfcc Allows ChoiceResponse CAPA problems to use script-computed variables to 
determine choice correctness, as MultipleChoiceResponse problems already do.

Adds a unit test for this change, and for the existing MultipleChoiceResponse
computed correctness capability.
 2016-10-14 08:20:14 +10:30
Eric Fischer
0928cfde80 Merge pull request #13734 from edx/efischer/async_grade 
Update persistent grades asynchronously
 2016-10-13 15:02:44 -04:00
Eric Fischer
c98f3d74c0 Merge pull request #13636 from edx/efischer/ora_1.1.9 
ORA version update
 2016-10-13 15:01:55 -04:00
Andy Armstrong
f2c3fa90f9 Merge pull request #13677 from edx/andya/move-language-apps 
Move dark_lang and lang_pref apps to openedx/core
 2016-10-13 14:47:37 -04:00
Brian Beggs
9a23babc9d Merge pull request #13747 from edx/release 
Merge hotfix back to master.
 2016-10-13 14:46:02 -04:00
Brian Beggs
f322517b60 Merge pull request #13746 from edx/release-candidate 
Pull hotfix in to release branch.
 2016-10-13 14:44:11 -04:00
Eric Fischer
70e029b1f5 Update persistent grades asynchronously 
For better user-facing performance, the SCORE_CHANGED signal is now handled by
enqueueing an async task to update the relevant stored grade, rather than
making the request wait until that operation finishes.

TNL-5738
 2016-10-13 14:06:06 -04:00
cahrens
bee04095bd Fix eslint violations. 2016-10-13 13:59:00 -04:00
cahrens
b8ddf709dc Convert javascript_loader to JS. 
Also reformat to 4 spaces per indent.
 2016-10-13 13:59:00 -04:00
Jesse Zoldak
d33532702a Merge pull request #13745 from edx/revert-13627-cdodge/restricted-oauth2-applications 
Revert "Cdodge/restricted oauth2 applications"
 2016-10-13 13:50:54 -04:00
Ben Patterson
0471c40ab8 Merge pull request #13742 from edx/benp/npm-cache-fix 
Fix for spurious 'cb() never called' errors.
 2016-10-13 13:38:21 -04:00
Jesse Zoldak
8004545cf5 Revert "Cdodge/restricted oauth2 applications" 2016-10-13 13:18:29 -04:00
Clinton Blackburn
8a97a5b8f4 Merge pull request #13627 from Microsoft/cdodge/restricted-oauth2-applications 
Cdodge/restricted oauth2 applications
 2016-10-13 12:48:50 -04:00
Ben Patterson
b2467147ae Script should exit non-zero if there is an error raised. 
Also, help with an echo.
 2016-10-13 12:38:01 -04:00
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -04:00
Nimisha Asthagiri
14d8a46d8c Merge pull request #13739 from edx/flaky/cohort-test 
Fix flaky bokchoy test: test_automatic_cohort_help, test_manual_cohort_help
 2016-10-13 11:36:37 -04:00
Adam
644a5798a1 Merge pull request #13715 from edx/adam/export-location-to-neo4j 
add location to attributes exported to neo4j
 2016-10-13 10:34:55 -04:00
Robert Raposa
e96bcbd79e Merge pull request #13682 from edx/robrap/urls-2 
Move more urls.py
 2016-10-13 10:34:03 -04:00
alisan617
392be599bb Merge pull request #13738 from edx/alisan/hot-fix-unit-title 
add child context check to unit page title TNL-5746
 2016-10-13 09:38:02 -04:00
Nimisha Asthagiri
9ed598e607 Merge pull request #13708 from edx/jeskew/move_config_models_to_external_repo 
Remove config_models & use external config_models repo instead.
 2016-10-13 08:55:01 -04:00
Ben Patterson
8295e742c9 Fix for spurious 'cb() never called' errors. 
Some Jenkins builds are erroring when attempting to set up the
npm environment with the error:

`npm ERR! cb() never called!`

Although it could point to a couple of different things, it is more classically
a sign of a dirty npm environment cache. Cleaning the cache at the start
of any given Jenkins job (which are sourced through this file) should
alleviate the problem.
 2016-10-13 07:57:21 -04:00
Nimisha Asthagiri
9f1d4cbf6f Fix flaky test_automatic_cohort_help bokchoy test 
TNL-5709
 2016-10-13 03:58:01 -04:00
Muzaffar yousaf
9d87472804 Merge pull request #13697 from edx/mzfr/flaky-bokchoy-4954 
Fixing flaky test_studio_help_links
 2016-10-13 12:02:40 +05:00
alisan617
8d429a91f3 add child of text check unit page 2016-10-12 17:23:51 -04:00
Jesse Zoldak
da7379f947 Merge pull request #13736 from edx/zoldak/fail-jenkins-report-build-on-error 
Return with an error code from the coverage reporting bash script
 2016-10-12 17:02:01 -04:00
Robert Raposa
e7028c6eab Move static_template_view.views to its own urls.py. 2016-10-12 14:37:18 -04:00
Robert Raposa
cd869d29a4 Move performance.views to its own urls.py. 2016-10-12 14:37:18 -04:00
Robert Raposa
8a9cf7e10e Move track.views to new urls.py 2016-10-12 14:37:18 -04:00
Jesse Zoldak
7fde150909 Return with an error code from the coverage reporting bash script if it encounters an error 2016-10-12 14:27:07 -04:00
Jesse Zoldak
d3b2d88361 Merge pull request #13732 from edx/zoldak/no-migrations-in-unittests 
Disable migrations by default in python unit tests
 2016-10-12 14:06:30 -04:00
Brian Beggs
fa81f303f5 Merge pull request #13735 from edx/release 
Merge release -> master for release-2016-10-12
 2016-10-12 14:06:17 -04:00
Jesse Zoldak
4465373177 Disable migrations by default in unittests 
Rendering model states when running migrate in Django 1.8 consumes
on the order of 4x-6x more memory than <1.8.

References:
* https://code.djangoproject.com/ticket/24745
* https://code.djangoproject.com/ticket/24743

This is causing failures in Jenkins as the workers run out of memory
and either processes cannot fork or the Out Of Memory Killer
kills a process that is running tests.

Disabling migrations until we do either or both of these:
* Upgrade to Django 1.9 and turn them back on. See EV-92 "Discovery: Upgrade edx-platform to Django 1.9"
* Address TE-1310 "Unit tests should be able to run without migrations"
 2016-10-12 14:02:19 -04:00
sanfordstudent
a9c548c3fa Merge pull request #13728 from edx/sstudent/hack-instructor-task 
Sstudent/hack instructor task
 2016-10-12 13:16:17 -04:00
Nimisha Asthagiri
e0b3866123 Merge pull request #13640 from edx/beryl/grading_policy_api 
Grading Policy endpoint in Grades API
 2016-10-12 13:14:06 -04:00
Brian Beggs
9629e5bdca Merge pull request #13709 from edx/release-candidate 
Release Candidate rc/2016-10-12
 2016-10-12 12:36:14 -04:00
Nimisha Asthagiri
dea4147232 Grading Policy endpoint in Grades API 
This copies the grading policy endpoint currently in the
course_structures django app to its new location, in preparation
to remove the old app.

TNL-5701
 2016-10-12 11:43:12 -04:00
Sanford Student
54d34e834d update all references to instructor module 2016-10-12 11:35:02 -04:00
sanfordstudent
83011e1c36 Merge pull request #13666 from edx/sstudent/hack-python-paths 
update all references to instructor module
 2016-10-12 11:31:29 -04:00