Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00
Calen Pennington
9e9825cb88 Enable the edge virtual university landing page in the lms 2012-10-11 13:18:01 -04:00
Victor Shnayder
a5dcdcb705 Check for None to fix 3.091 progress tab crash 
- get_module() contract says it can return None (e.g. if access control check failed)
 2012-10-11 13:08:05 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
Calen Pennington
c8d267fb72 Fix minor typo in access.py 2012-10-10 22:03:08 -04:00
Calen Pennington
2b030f7aaf Clean up how tests use modulestores 2012-10-10 12:49:51 -04:00
Chris Dodge
a80e8ce3d5 respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS 2012-10-09 15:11:07 -04:00
Victor Shnayder
227cc58d30 fix a bug: can_load() should check for the 'load' permission. 
- triggered by anon users when all courses have started (or start dates are off).
 2012-10-02 18:59:04 -04:00
David Ormsbee
1c823b375c Merge pull request #790 from MITx/feature/bridger/max_grade_cache_fix 
Fix to update the max_grade cache on StudentModule
 2012-09-30 19:08:50 -07:00
Victor Shnayder
af6dd84af0 Merge pull request #789 from MITx/feature/bridger/course_grading 
Feature/bridger/course grading
 2012-09-30 11:52:36 -07:00
Bridger Maxwell
fd43e94318 If an problem was updated and had a new max score it wasn't recached. Now it is fixed. 2012-09-28 23:38:49 -04:00
Bridger Maxwell
fc73916e05 Removed django.conf.settings dependency from graders. 2012-09-28 23:14:55 -04:00
Calen Pennington
8838c50f0d Merge pull request #770 from MITx/feature/dave/progress_reverse_quickfix 
Put tests to check ordering of scores returned on progress page.
 2012-09-28 05:56:56 -07:00
David Ormsbee
7a6eedb3f1 Make it so we don't require HTTP basic auth to talk to the queue server 2012-09-27 19:02:34 -04:00
ichuang
35569d1086 Merge pull request #731 from MITx/feature/ichuang/symmath_improvements 
improvements in symbolic math checking.

Merging now because it is needed for Physics courses.
 2012-09-25 19:36:02 -07:00
David Ormsbee
305dcfc4e9 Put tests to check ordering of scores returned on progress page. 2012-09-25 12:54:06 -04:00
David Ormsbee
5f6cc6ef93 Quick fix for scores within a homework/lab showing up in reverse order. 
The real fix would be to have yield_dynamic_descriptor_descendents return
things in the proper order, but I'm not entirely sure what's going on
there, and this is a bug on prod now.
 2012-09-24 16:24:38 -04:00
Calen Pennington
2edda935f7 Merge pull request #764 from MITx/feature/victor/fix-index-js-caching 
Also make the actual ?next redirection work with caching
 2012-09-24 06:20:52 -07:00
Victor Shnayder
a8aced9bba Also make the actual ?next redirection work with caching 
- use js instead of django to do the redirection
 2012-09-24 09:15:06 -04:00
kimth
c1fc50437a Adjust comments 2012-09-22 23:11:26 -07:00
kimth
48b93fc985 Arbitrary grading markers 2012-09-22 23:01:04 -07:00
Bridger Maxwell
68ab19730f Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 
Conflicts:
	lms/djangoapps/courseware/views.py
 2012-09-20 17:42:31 -04:00
Bridger Maxwell
997c0ee1c6 Grading test now tries a weighted problem. 2012-09-20 17:38:07 -04:00
Bridger Maxwell
92171ea5da Added course grading test. 2012-09-20 16:56:27 -04:00
Bridger Maxwell
9ec38176e0 Small cleanup tweaks in grading. 2012-09-20 16:56:09 -04:00
Victor Shnayder
621acd20e3 broken tabs are important enough to count as an error, not a warning 2012-09-20 10:52:40 -04:00
Victor Shnayder
a19319f7fb add some error handling 2012-09-20 10:36:22 -04:00
Bridger Maxwell
21f8fc3f9c Fixed small bug. 2012-09-20 02:17:51 -04:00
Bridger Maxwell
b62e13aec8 Using new xmodule API in grades.py. 2012-09-20 02:06:41 -04:00
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -04:00
Victor Shnayder
4a162dadae bugfixes for static tabs 
- move courseware wiki views above catch-all rule
- handle courses with no custom tabs
 2012-09-20 01:11:59 -04:00
Bridger Maxwell
234fb813c6 Changed grades.grade to use new xmodule API. Now properly explores descriptor tree. 2012-09-20 01:03:43 -04:00
Victor Shnayder
7a88223ef7 custom tabs 
* still needs better error checking and testing
 2012-09-20 00:51:23 -04:00
ichuang
f1e5d6976e fix tabs fallback check when no tabs specified 2012-09-19 20:49:36 -04:00
Bridger Maxwell
b65577f2b7 Fixed tests for fast grading. 2012-09-18 13:18:19 -04:00
David Ormsbee
62bb10156d Merge pull request #704 from MITx/feature/victor/custom-tabs 
Custom tabs
 2012-09-18 07:10:42 -07:00
Victor Shnayder
a242ac54b0 remove dead code 2012-09-18 10:10:07 -04:00
Calen Pennington
c914a46a3f Merge pull request #691 from MITx/feature/victor/anon-deep-links 
Feature/victor/anon deep links
 2012-09-18 07:08:45 -07:00
Victor Shnayder
d9219c6086 Custom tabs 
* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)
 2012-09-18 08:45:09 -04:00
Bridger Maxwell
1e0932b734 Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 2012-09-16 00:39:43 -04:00
Bridger Maxwell
bdc9e55fd0 Fixed progress_summary to use get_display_items(), which respects access control. 2012-09-16 00:36:26 -04:00
Arjun Singh
08464725c3 Try and find a run-specific syllabus before loading a course-specific syllabus 2012-09-15 05:02:28 -07:00
Victor Shnayder
a788db53e9 Show login modal if there's a next param to index, university index 
* also replace the external-auth-related popping up of the signup form with jquery.
Presumably it takes care of the browser specific stuff.
 2012-09-14 14:31:04 -04:00
Victor Shnayder
f4a93b7c70 Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links 2012-09-13 10:22:44 -04:00
Victor Shnayder
66343884dc pull ocw links from about/ocw_links.html 
format should be
<ul>
<li>link</li>
<li>other link</li>
</ul>
 2012-09-13 10:22:02 -04:00
Bridger Maxwell
5df381e728 Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 2012-09-11 13:37:54 -04:00
ichuang
1f07bb0466 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/psychometrics 2012-09-10 22:03:08 -04:00
Victor Shnayder
779f865691 remove check-for-404 hack from tests now that we get real 404s 2012-09-10 10:49:12 -04:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00