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

919 Commits

Author SHA1 Message Date
Calen Pennington
2802302162 Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course 2012-10-24 11:51:25 -04:00
Calen Pennington
dab77e7d79 Switch to using staff group names that are only specified by org/course, rather than the full course_id 2012-10-23 13:40:50 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
Carlos Andrés Rocha
e7c62b0fc6 Add migrations to license django application 2012-10-16 11:57:38 -04:00
Carlos Andrés Rocha
a8cedf8ab9 Update lms/djangoapps/licenses/views.py 
Remove annoying print statements
 2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8 Added django command to generate random serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6 Added import_serial_numbers command test. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342 Added html view of serial numbers. Refactored code. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7 Added licenses view helper functions. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71 Renamed models and commands for importing serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -04:00
Carlos Andrés Rocha
f1120a1139 Removed unused import 2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701 Fix to read utf-8 enconded html files for custom course tabs 2012-10-12 17:36:19 -04:00
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
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
David Ormsbee
d0668043a5 Merge pull request #861 from MITx/feature/ichuang/dump_grades 
add django management command for dumping grades to CSV file
 2012-10-11 10:24:19 -07:00
Calen Pennington
096d6853eb Allow for branding subdomains that are longer than a single . 2012-10-11 13:18:27 -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
5ae34aa4ed Add heartbeat to cms 2012-10-11 12:32:23 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
ichuang
778017fc3e add django management command for dumping grades to CSV file 2012-10-11 11:30:57 -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
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