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

888 Commits

Author SHA1 Message Date
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
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
arjun810
df2b06f235 Merge pull request #760 from MITx/kimth/fix-gradebook 
Kimth/fix gradebook
 2012-09-23 22:17:43 -07:00
kimth
c1fc50437a Adjust comments 2012-09-22 23:11:26 -07:00
Ibrahim Awwal
ad7e84ad0e Fix forums in IE9; apparently it's just very strict about the charset being a valid identifier. utf8 is not a valid identifier, utf-8 is. 2012-09-22 23:01:34 -07:00
kimth
48b93fc985 Arbitrary grading markers 2012-09-22 23:01:04 -07:00
David Ormsbee
a4d4a3b022 Merge pull request #650 from MITx/feature/bridger/course_grading 
Feature/bridger/course grading
 2012-09-21 08:10:03 -07:00
Arjun Singh
8fb6204073 Better fix for trailing slash 2012-09-21 05:42:51 -07:00
Ibrahim Awwal
939b927fbd Merge branch 'master' into feature/ibrahim/followed-threads 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
 2012-09-20 23:55:13 -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
Victor Shnayder
26a63850b3 Merge pull request #733 from MITx/feature/victor/static-tabs 
Feature/victor/static tabs
 2012-09-20 14:37:35 -07: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
Arjun Singh
55a9da933a DRY things slightly 2012-09-20 02:15:51 -07:00
Arjun Singh
3567e23a9d Unneeded imports 2012-09-20 02:13:35 -07:00
Arjun Singh
6824ab6305 Merge branch 'master' into feature/arjun/unread_count 2012-09-20 00:34:30 -07:00
Arjun Singh
117c0b6927 Mark threads as read once they are fetched; change viewed to read 2012-09-20 00:24:36 -07: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
David Ormsbee
f9a49ece6f Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values 2012-09-19 17:12:08 -04:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
Bridger Maxwell
142624a6ca Added select_related to gradebook. Slight performance boost. 2012-09-19 00:20:46 -04:00
David Ormsbee
97c880a714 Fix CSV downloads when there are non-ASCII chars in student data, and prefetch groups info to speed up the grades page 2012-09-18 20:39:42 -04:00
David Ormsbee
0b3ae9052a Make the default topic a dict so it doesn't error on courses that don't specify topics 2012-09-18 19:19:08 -04:00
Ibrahim Awwal
6315fe3fe6 Allow sorting followed threads (works same as sorting anything else). 2012-09-18 14:50:38 -07:00
Ibrahim Awwal
53a1611eee Change following=>followed. 2012-09-18 14:50:14 -07: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