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

463 Commits

Author SHA1 Message Date
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
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
Bridger Maxwell
87da104974 Changes to speed up the progress summary too. 2012-09-08 01:09:42 -04:00
Bridger Maxwell
3baf92a849 Changed course grading to avoid initing capa modules. 2012-09-08 00:26:16 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position 
Feature/victor/save course position
 2012-09-07 06:42:48 -07:00
Victor Shnayder
1e94ff19f3 remove debuging log message 2012-09-07 08:20:59 -04:00
Victor Shnayder
048dea0eff make test course loading deterministic by using course_id 2012-09-06 16:38:33 -04:00
Victor Shnayder
02ddeed72a better error handling in index view 2012-09-06 16:24:59 -04:00
Victor Shnayder
d4c0516c8b another attempt to see what's broken on jenkins 2012-09-06 14:41:09 -04:00
Victor Shnayder
6ab80fb4a8 debug msg to diagnose jenkins 2012-09-06 12:06:51 -04:00
Victor Shnayder
f44898677a Allow course info and course about pages to vary per-run 
* looks in about/{course.url_name}/ first, then in about/
* same for info/
 2012-09-06 11:17:55 -04:00
Victor Shnayder
91d0fe8a1b extend test to cover first-chapter state 2012-09-06 10:25:56 -04:00
Victor Shnayder
7c34b02e3b use a NoFollow redirect check 2012-09-05 17:25:16 -04:00
Victor Shnayder
5738a8cdbb update tests 2012-09-05 16:15:53 -04:00
Victor Shnayder
c354a120d8 Track accordion state: 
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
  (not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
 2012-09-05 16:15:53 -04:00
Victor Shnayder
4481adb041 Track current chapter. 
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
 2012-09-05 16:15:53 -04:00
Victor Shnayder
d0fcbdda8c convert answers to strings to make sure they're hashable 2012-09-05 16:00:04 -04:00
Victor Shnayder
a8cd4633c0 remove debugging statements 2012-09-05 13:46:15 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Victor Shnayder
c89031b077 Export of answer distibutions to csv 
- go through all students, all of their problems, save count for each answer
- return csv
- url exists, but no links to it yet
- Will need to integrate with Ike's new dashboard code
 2012-09-05 13:40:29 -04:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master 
Cleanup of 'About Course' page link to its Courseware
 2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade 
Upgrade to instructor dashboard
 2012-09-05 08:03:55 -07:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00
ichuang
4cbdf90d5e cleaned up access.py - now has _has_instructor_access_to_loation 2012-09-04 18:26:22 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00