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

39077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
b2c8ff05a6 Merge pull request #13802 from edx/ECOM-5050 
ECOM-5050 Expose mobile-friendly field for course runs returned by Course API
 2016-10-21 10:27:07 -04:00
Nimisha Asthagiri
ada4e0823b Merge pull request #13721 from edx/beryl/rescore_higher 
Support for rescoring a problem only if score is improved.
 2016-10-20 16:08:04 -04:00
Nimisha Asthagiri
aa000c1a3d Support for rescoring a problem only if the new score is higher 
TNL-5046
 2016-10-20 15:08:54 -04:00
Matthew Piatetsky
3d72229168 Expose mobile-friendly field for course runs returned by Course API 2016-10-20 14:35:31 -04:00
Ned Batchelder
0e3e1b479a Merge pull request #13800 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-20 13:02:22 -04:00
alisan617
0799033693 Merge pull request #13681 from edx/alisan/instructor-dashboard-coffeescript 
Convert instructor dashboard coffeeScript to js
 2016-10-20 12:45:29 -04:00
George Song
e1a0072b75 Merge pull request #13796 from edx/george/pin-sqlparse 
Pin `sqlparse` to 0.2.x
 2016-10-20 08:58:20 -07:00
alisan617
6255e20262 Merge pull request #13646 from edx/alisan/capa-i18n-btn-bar-fix-TNL-5642 
Capa button bar attempt message position for i18n
 2016-10-20 11:55:21 -04:00
Ned Batchelder
08f7198f16 Update translations (autogenerated message) 2016-10-20 15:42:15 +00:00
Eric Fischer
8ceb73455a Merge pull request #13773 from edx/efischer/actually_retry 
update_course_in_cache should retry on exceptions
 2016-10-20 10:48:13 -04:00
Eric Fischer
7c1913b702 Merge pull request #13765 from edx/efischer/grades_task_retry 
Recalculate Subsection Grade task retry logic
 2016-10-20 10:47:58 -04:00
Cliff Dyer
ac48c2e42f Merge pull request #13716 from edx/cdyer/fix-problem-block-tests 
Make problem block tests more realistic.
 2016-10-20 10:36:45 -04:00
alisan617
5fe397f8c9 change Instructor Dashboard coffeeScript bundle path and move fixtures to JS folder, plus eslint 2016-10-20 09:32:45 -04:00
J. Cliff Dyer
1cfff02f06 Add tests for scoring of diverse problem types. 
Includes:
* CAPA
* ORA
* LTI
* LTI-Consumer
* SGA
* Randomized Content Block

TNL-5692
TNL-5464
 2016-10-20 09:29:55 -04:00
alisan617
a43c1e9469 change layout in submit button bar for i18n 2016-10-20 09:27:48 -04:00
alisan617
04fa2a4263 Merge pull request #13793 from edx/alisan/page-navs-wraps-TNL-5794 
byte-size fix for 2 lines page navs
 2016-10-20 09:19:15 -04:00
Mushtaq Ali
8f11bca03c Merge pull request #13712 from edx/mushtaq/numerical-additional-answers 
Add support for additional answers for Numerical Input problems
 2016-10-20 15:50:27 +05:00
Mushtaq Ali
387f210363 Add support for additional answers for Numerical Input problems 
TNL-5581
 2016-10-20 09:40:01 +00:00
George Song
f62eadaa17 Pin sqlparse to 0.2.x 2016-10-19 16:45:31 -07:00
alisan617
9bcbb25b86 byte-size fix for 2 lines page navs 2016-10-19 19:13:58 -04:00
Christina Roberts
19ce439360 Merge pull request #13710 from edx/christina/capa-edit-coffee 
Convert problem/edit.coffee to JS
 2016-10-19 17:45:29 -04:00
cahrens
113aec25bf eslint corrections 2016-10-19 16:19:10 -04:00
Eric Fischer
8f0134b7e4 update_course_in_cache should retry on exceptions 
Previously, retry() was never called, so the task was never retried despite
defining several retry-related variables.
 2016-10-19 14:09:28 -04:00
sanfordstudent
f5647878d9 Merge pull request #13771 from edx/sstudent/TNL-5658 
add grading policy hash to transformer
 2016-10-19 13:38:25 -04:00
Jesse Zoldak
d777749f18 Merge pull request #13792 from edx/zoldak/adjust-lint-thresholds 
Adjust lint thresholds
 2016-10-19 12:21:19 -04:00
Sanford Student
9209eef7e2 add grading policy hash to transformer 2016-10-19 11:35:51 -04:00
Jesse Zoldak
6afe026a4c Adjust lint thresholds 2016-10-19 11:11:42 -04:00
Eric Fischer
2ca7484c1a Merge pull request #13763 from edx/efischer/use_env_tokens 
Allow Celery queue settings to be defined by ENV_TOKENS
 2016-10-19 10:02:22 -04:00
Jeremy Bowman
c8b36a6ac1 Merge pull request #13161 from mitocw/fix/aq/support_django_oauth_toolkit 
Fixed authentication classes to support Django OAUTH Toolkit
 2016-10-19 10:00:15 -04:00
Eric Fischer
529889f3f2 Recalculate Subsection Grade task retry logic 
The task will now be retried if an IntegrityError is encountered, up to
the default of 3 times. Test included.

TNL-5739
 2016-10-19 09:45:34 -04:00
Jesse Shapiro
6ccb74c7d5 Merge pull request #13323 from open-craft/upgrade-django-storage-swift 
Upgrading django-storage-swift module to take advantage of pending PR
 2016-10-19 09:27:23 -04:00
Jesse Shapiro
e431459cb5 Upgrade django-storage-swift to 1.2.12 2016-10-19 08:16:37 -04:00
Saleem Latif
f3089e9eec Merge pull request #13783 from edx/saleem-latif/ENT-28 
ENT-28: Add testing for 'saml' management command
 2016-10-19 14:11:31 +05:00
Saleem Latif
38931957e2 Add testing for 'saml' management command 2016-10-19 12:49:41 +05:00
Tim Krones
907801d6e4 Merge pull request #13611 from open-craft/itsjeyd/update-xblock-drag-and-drop-v2 
Update DnDv2 to v2.0.11.
 2016-10-19 09:02:34 +02:00
Ayub khan
d3fcb44631 Merge pull request #13782 from edx/ECOM-5846 
ECOM-5846 Add more logs for enrollment api
 2016-10-19 11:51:04 +05:00
Jesse Zoldak
b15378a28b Merge pull request #13776 from edx/zoldak/TE-1587 
Add enable-migrations parameter for python unit tests
 2016-10-18 22:52:22 -04:00
Christina Roberts
6b3aa71102 Merge pull request #13730 from indagation/fix_staticbook_url 
Fix Malformed Staticbook url
 2016-10-18 21:45:56 -04:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -04:00
Nimisha Asthagiri
3ebdec220a Merge pull request #13760 from edx/release-candidate 
Release Candidate rc/2016-10-18
 2016-10-18 18:06:28 -04:00
Christina Roberts
9dc2d11736 Merge pull request #13542 from deepsrijit1105/Country 
Fix Moldova spelling on dropdown list
 2016-10-18 17:56:23 -04:00
Christina Roberts
fbf0e9447c Merge pull request #13685 from indagation/http-duplicate-fix 
Removed unnecessary http:
 2016-10-18 17:53:16 -04:00
Nimisha Asthagiri
d078b65ea7 Merge pull request #13754 from edx/flaky/video-test 
Fix flaky test: test_youtube_id_w_different_local_server_sub
 2016-10-18 16:42:43 -04:00
cahrens
0fb37ceeb6 Replace with JS code. 2016-10-18 16:27:29 -04:00
cahrens
337d4947c0 Rename to edit.js 2016-10-18 16:27:29 -04:00
Christina Roberts
7de60d1278 Merge pull request #13764 from edx/christina/tnl-5735 
Fix screen-reader capa status prefixing
 2016-10-18 14:43:01 -04:00
Christina Roberts
b693d98a1f Merge pull request #13531 from Bound3R/patch-1 
Remove invalid selector
 2016-10-18 14:38:46 -04:00
Toby Lawrence
ef3b0e4702 Merge pull request #13544 from edx/TNL-5632 
[TNL-5632] Don't request responses/comments for non-AJAX requests.
 2016-10-18 14:06:21 -04:00
Nimisha Asthagiri
ba9ef89e8d Fix CCX migration to be resilient to course-not-found 2016-10-18 13:55:25 -04:00
Robert Raposa
4d301b9b98 Revert MathJax -full config. 2016-10-18 13:55:25 -04:00