Piotr Mitros
34dc32e5aa
Unstable state; need to merge from master
2012-05-31 13:44:45 -04:00
Calen Pennington
9fdbdd3b73
Merge pull request #71 from MITx/pmitros/modular-refactor
...
Pmitros/modular refactor
2012-05-30 13:31:44 -07:00
Piotr Mitros
2c2072dae3
Converted to use more semantic tags. Working snapshot.
2012-05-27 07:39:09 -04:00
ichuang
22572bf87b
fix multicourse to properly set COURSE_TITLE (navigation.html uses settings.COURSE_TITLE)
2012-05-26 17:05:52 -04:00
Piotr Mitros
fbada1a964
Merge branch 'master' into pmitros/modular-refactor
2012-05-26 11:42:03 -04:00
Calen Pennington
1b5a9bc547
Moving the 'id' prefix back into content_parser where it exists
2012-05-25 11:04:05 -04:00
Calen Pennington
dea0d28ace
Url encode memcache keys, rather than writing a new encoding scheme. Also use fasthash, rather than md5
2012-05-25 10:52:04 -04:00
Calen Pennington
0af8502c6d
Dirt-simple heartbeat page for use by AWS load balancers
2012-05-22 15:39:40 -04:00
Piotr Mitros
32c50090eb
Very draft/prototype edits. Moving CMS components in LMS.
2012-05-21 19:27:00 -04:00
Piotr Mitros
9906bd2b6b
Moved code examples into snippets
2012-05-21 14:54:03 -04:00
Calen Pennington
431704ac88
Make courseware work with multicourse disabled
2012-05-21 12:59:51 -04:00
Calen Pennington
03a9be7e78
Add newrelic handler, rather than custom function to log exceptions
2012-05-21 12:12:16 -04:00
David Ormsbee
4fe22be501
Merge pull request #59 from MITx/pmitros/modular-refactor
...
First part of courseware refactor
2012-05-21 06:21:43 -07:00
Piotr Mitros
bb66cad68b
Code review -- comments and better exceptions
2012-05-21 09:18:40 -04:00
Piotr Mitros
abdd696f7e
Modular refactor: Fixed bugs. Tests work.
2012-05-20 16:08:10 -04:00
Piotr Mitros
e9468a0e5e
Modular refactor: Very minor changes (comments, etc.)
2012-05-20 15:22:39 -04:00
Piotr Mitros
d95a5e462d
Modular refactor: Better names (grade to get_score, etc.
2012-05-20 14:52:48 -04:00
Piotr Mitros
29f565dd6e
Modular refactor: Input types register in SimpleInput with decorator
2012-05-20 13:38:02 -04:00
Piotr Mitros
cd67ec8fc1
Modular refactor: Input types look more like x_module
2012-05-20 13:31:37 -04:00
ichuang
a76248251a
fix quickedit (request.user_is_staff is not a function); small edit to problem.html
...
to show quickedit when settings.QUICKEDIT is True. add
mathjax_include.html because that is needed by quickedit.html
2012-05-17 22:48:39 -04:00
ichuang
22c75cf748
make courseware/capa/util.py contextualize_text return gracefully if text = None
2012-05-17 22:39:20 -04:00
ichuang
5e8fbcdc8d
fix multicourse; fix bug in I4xSystem - self.filestore not set when
...
filestore not None. mitxhome.html now properly automatically lists
all courses given in settings.COURSE_SETTINGS. mitxhome now served
from multicourse.views. optioninput.html was missing; fixed. cleaned
up access to request.session for coursename in courseware/views.py
2012-05-17 22:29:45 -04:00
David Ormsbee
b8b9928a09
Merge pull request #54 from MITx/pmitros/removing-fs-refs-pull
...
More code transitioned to pyfilesystem
2012-05-17 14:24:41 -07:00
Piotr Mitros
0e3349706a
Fix minor bugs, commenting out future code
2012-05-17 15:48:47 -04:00
Piotr Mitros
cad13b30a1
Passing i4x system deeper into capa_problem
2012-05-17 15:37:08 -04:00
Calen Pennington
9859e8546d
Move accept header computations out of middleware
2012-05-17 13:23:20 -04:00
Calen Pennington
e7ab1aa9be
Fixing typo from merge
2012-05-17 11:42:56 -04:00
Calen Pennington
f30596c499
Merge branch 'master' into specific-error-handling
...
Conflicts:
djangoapps/courseware/views.py
2012-05-17 11:39:21 -04:00
Calen Pennington
4a9a28c76b
Clean up indentation in ssl_auth
2012-05-17 10:12:00 -04:00
Calen Pennington
d387843ccc
Fixing up check_course to pull in modules correctly
2012-05-17 09:18:36 -04:00
Isaac Chuang
ad44882835
Ike's changes to enable multicourse, new response types, etc.
2012-05-16 21:18:47 -04:00
Calen Pennington
69321b4497
Display the appropriate type of error message depending on the type of the incoming request
2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e
Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down
2012-05-16 11:46:09 -04:00
Calen Pennington
08620eaf34
Fixing tests and removing unused/broken code
2012-05-15 14:02:33 -04:00
Calen Pennington
02bb23f46a
Minor formatting cleanup
2012-05-15 10:55:57 -04:00
Prem Sichanugrist
28d12628f7
Fix missing global_context problem
...
This problem was introduced in 232e758c7a
2012-05-14 15:43:50 -04:00
Calen Pennington
8f79c94d0a
Fix one more place where simplewiki was importing the wrong settings
2012-05-14 11:51:07 -04:00
Calen Pennington
ee258f7acf
Fix place where simplewiki was importing the wrong settings
2012-05-14 11:46:30 -04:00
Calen Pennington
371ce6968c
Removing empty django module
2012-05-14 11:14:55 -04:00
Isaac Chuang
8989605cba
Moving in Ike's new files, touches of multicourse
2012-05-13 20:33:29 -04:00
Isaac Chuang
15cae333d4
Ike's new input types
2012-05-13 19:58:39 -04:00
Isaac Chuang
232e758c7a
Integrating some of Ike's courseware changes
2012-05-13 19:36:01 -04:00
Piotr Mitros
756dc97897
Moved grading code from init to grades.py to fix existing scripts
2012-05-12 17:16:36 -04:00
Piotr Mitros
095043ca8b
Custom response gives poor errors when there is no checker code
2012-05-12 15:16:29 -04:00
Piotr Mitros
85079da3a7
Minor bug fix/conflict between grades and i4xsystem
2012-05-12 15:03:20 -04:00
Isaac Chuang
747105e328
More minor cleanups
2012-05-11 17:05:14 -04:00
Isaac Chuang
668062a19b
Minor cleanups to capa_module (comments, formatting, etc.)
2012-05-11 17:02:06 -04:00
Lyla Fischer
72dee8ba14
merge with master
2012-05-11 13:17:52 -04:00
Lyla Fischer
a0201f37a0
names not required
2012-05-11 12:31:59 -04:00
Piotr Mitros
98f19470f0
Fixed bad merge between Cale and Piotr/I4xSystem missing reference
2012-05-11 07:45:02 -04:00
