Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 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
Muzaffar yousaf
eb6bb03604 Merge pull request #13808 from edx/mzfr/flaky-bokchoy-tnl5691 
Remove flaky for test_full_name_field
 2016-10-25 14:27:03 +05:00
muzaffaryousaf
a62b84b864 Removing flaky since test failure is not reproduceable. 
TNL-5691
 2016-10-25 12:09:42 +05:00
Ned Batchelder
53f8516b8e Merge pull request #13825 from edx/release 
Release
 2016-10-24 19:33:39 -04:00
alisan617
8acf94070c revert and fix membership tab course team mgmt section 2016-10-24 19:24:33 -04:00
Albert (AJ) St. Aubin
43b4141cdf Merge pull request #13613 from edx/aj/TNL-5644_exposed_icon 
Aj/tnl 5644 exposed icon
 2016-10-24 17:47:18 -04:00
Albert St. Aubin
055fd6ea8f Refactored the status icon and span to a unified template and updated tests 2016-10-24 16:48:58 -04:00
Adam
aa9fa28a6b Merge pull request #13812 from edx/hotfix/2016-10-24 
Hotfix/2016 10 24
 2016-10-24 16:05:00 -04:00
Nimisha Asthagiri
2e6d4752a0 Merge pull request #13813 from edx/beryl/rescore-task-name 
Correct task_type for other rescore-if-higher admin commands
 2016-10-24 15:46:15 -04:00
Dmitry Viskov
bedc208160 TNL-5821 - bugfix 2016-10-24 21:45:13 +03:00
Nimisha Asthagiri
52069197c7 Correct task_type for other rescore-if-higher admin commands. 2016-10-24 13:43:24 -04:00
Christina Roberts
69235ebb50 Merge pull request #13801 from edx/christina/ac-582 
AC-582 progress page markup corrections
 2016-10-24 13:37:13 -04:00
Nimisha Asthagiri
9fb9222a6c Merge pull request #13806 from edx/beryl/gating-again 
Unrevert "Fix Gating to use grades API, instead of its own calculations"
 2016-10-24 13:33:50 -04:00
Adam Palay
51c7ca67f0 address flaky tests by adding time.sleep 2016-10-24 13:23:58 -04:00
alisan617
e05262e7de Merge pull request #13818 from edx/alisan/submit-button-RTL 
submit button in RTL
 2016-10-24 12:40:33 -04:00
Nimisha Asthagiri
7aacae9a4f Unrevert "Fix Gating to use grades API, instead of its own calculations" 2016-10-24 12:33:59 -04:00
alisan617
a154fea9f9 submit button in RTL 2016-10-24 10:04:38 -04:00
M. Rehan
5835468d94 Merge pull request #13362 from edx/mushtaq/generate-verified-users-with-audit-certs 
Generate certificates for verified users with audit certificate statuses
 2016-10-24 16:22:45 +05:00
Ben Patterson
56676e5711 Bug fix: collect test results when running in multiprocess mode. 2016-10-23 17:14:15 -04:00
E. Kolpakov
aab3ad5c35 Addded enterpirse app 2016-10-21 20:15:41 +03:00
Albert (AJ) St. Aubin
c01df60014 Merge pull request #13786 from edx/aj/TNL-5549_problemMetaRefactor 
Aj/tnl 5549 problem meta refactor
 2016-10-21 13:03:32 -04:00
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
Qubad786
65ef041a53 Add ability to generate certs for audit_passing/audit_notpassing learners 2016-10-21 16:03:29 +05:00
Mushtaq Ali
dacfcc985f Generate certificates for verified users with audit certificate statues - ECOM-5012 2016-10-21 16:03:28 +05:00
Albert St. Aubin
dbb66f8c09 Updated the problem meta to show a score of 0 and refactored/simplified the JS that build the problem meta string 
TNL-5549
 2016-10-21 06:40:20 -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
Chris Rodriguez
3b9c970ce5 AC-582 progress page markup corrections 2016-10-20 12:55:59 -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
Robert Raposa
13222adf05 Upgrade MathJax to 2.7. 2016-10-20 10:53:04 -04: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