Piotr Mitros
|
0888eed906
|
Post-merge cleanup
|
2012-02-20 13:06:13 -05:00 |
|
Piotr Mitros
|
34affdabde
|
Merge with new settings
--HG--
rename : settings_new_askbot.py => settings.py
|
2012-02-20 12:14:48 -05:00 |
|
Piotr Mitros
|
8dec0aa7cd
|
Merging with fixes to Capa
|
2012-02-20 12:06:19 -05:00 |
|
Piotr Mitros
|
c16ac4fb4e
|
Merge with local template paths
|
2012-02-20 12:03:59 -05:00 |
|
Piotr Mitros
|
7bd509b7ed
|
Beginning to merge new settings file
--HG--
branch : pmitros-dormsbee-settings2
rename : settings_new_askbot.py => settings.py
|
2012-02-20 11:29:12 -05:00 |
|
Piotr Mitros
|
e57fc19045
|
Including namespace for sections
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:16:22 -05:00 |
|
Piotr Mitros
|
1befa20b12
|
Last commit tested and debugged
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:08:22 -05:00 |
|
Piotr Mitros
|
0d9a24e4f4
|
Templates broken into namespaces
--HG--
branch : pmitros-mod-template
|
2012-02-19 20:12:34 -05:00 |
|
Piotr Mitros
|
5fe68e3a43
|
Merge to default for next developments
--HG--
branch : pmitros-mod-template
|
2012-02-19 19:34:36 -05:00 |
|
Piotr Mitros
|
622c4e3427
|
Eliminated save button where not relevant
--HG--
branch : pmitros-capa-fixes
|
2012-02-19 17:27:21 -05:00 |
|
Piotr Mitros
|
cb27c471ff
|
Capa problems handle case sensitivity and give better errors
--HG--
branch : pmitros-capa-fixes
|
2012-02-19 17:03:46 -05:00 |
|
David Ormsbee
|
ffba3c59a5
|
Merge AB testing branch I should have pulled in a week ago.
|
2012-02-17 15:26:58 -05:00 |
|
Bridger Maxwell
|
2c634d35cd
|
Merge
|
2012-02-17 00:40:27 -05:00 |
|
Piotr Mitros
|
93011db4e3
|
Staff can see problem XML
|
2012-02-16 14:55:27 -05:00 |
|
Piotr Mitros
|
c02502b34b
|
New constant for calculator and new tests
|
2012-02-16 13:36:09 -05:00 |
|
Bridger Maxwell
|
3a515bfdf8
|
Merged in profilecleanup
|
2012-02-15 14:26:47 -05:00 |
|
Piotr Mitros
|
a8bcd38b04
|
merge
|
2012-02-14 17:40:57 -05:00 |
|
Piotr Mitros
|
d946621915
|
Fixed course check
|
2012-02-14 17:40:46 -05:00 |
|
David Ormsbee
|
a5b9372e4f
|
document inability to run evaluator with non-float variables
|
2012-02-14 16:50:18 -05:00 |
|
David Ormsbee
|
ed9f2f421b
|
sort keys so evaluation takes longer terms first - vars like 'e2' will be substituted in before mathematical constants like 'e'
|
2012-02-14 12:10:09 -05:00 |
|
David Ormsbee
|
8174e49690
|
echo change in 1a68a3047124 to remove outdated call to modules.get_module_class
--HG--
branch : pmitros-mod-template
|
2012-02-14 11:49:47 -05:00 |
|
Piotr Mitros
|
6e9c320a5a
|
Major bug -- using obsolete ID type in modx_render. Minor bug -- profile page broken
|
2012-02-13 18:05:23 -05:00 |
|
Piotr Mitros
|
c943065931
|
Merge with template view
|
2012-02-13 17:11:09 -05:00 |
|
Piotr Mitros
|
20ada529f6
|
Help file added to static views
|
2012-02-13 17:10:52 -05:00 |
|
Piotr Mitros
|
9ab2f59130
|
Removed debug print code for merge
--HG--
branch : pmitros-mod-template
|
2012-02-13 17:07:31 -05:00 |
|
Piotr Mitros
|
44e124c46f
|
Removed file system hackery
--HG--
branch : pmitros-mod-template
|
2012-02-13 17:06:16 -05:00 |
|
Piotr Mitros
|
7c5d93a514
|
Commented out debug print statements for possible merge
--HG--
branch : pmitros-mod-template
|
2012-02-13 16:46:01 -05:00 |
|
Piotr Mitros
|
caa2ed9195
|
Removed comments and obsolet error codes
|
2012-02-13 16:36:48 -05:00 |
|
Piotr Mitros
|
126c1f982c
|
Removed extra print statement
|
2012-02-13 13:10:14 -05:00 |
|
Piotr Mitros
|
e05e05f445
|
merge in tolerance bug fix
|
2012-02-13 13:08:36 -05:00 |
|
Piotr Mitros
|
fca78b83ba
|
Relative tolerance, minor clean-up, as per Dave
--HG--
branch : tolerance_bug
|
2012-02-13 08:10:32 -05:00 |
|
Piotr Mitros
|
a4dc01509a
|
Bug fix. Not very tested
--HG--
branch : tolerance_bug
|
2012-02-13 00:30:22 -05:00 |
|
Piotr Mitros
|
7b49f21ec7
|
Merge
|
2012-02-12 09:48:47 -05:00 |
|
Piotr Mitros
|
d22c0cd5fb
|
Legal name required, better error messages
|
2012-02-12 09:48:06 -05:00 |
|
Piotr Mitros
|
cc28d828b0
|
Added template_module.py, which I omitted a few commits ago
--HG--
branch : pmitros-mod-template
|
2012-02-11 18:00:12 -05:00 |
|
Piotr Mitros
|
33013a0b15
|
Test cases, basic framework for moving id tags out of content_parser
--HG--
branch : pmitros-mod-template
|
2012-02-11 15:07:15 -05:00 |
|
Piotr Mitros
|
b274c2e26c
|
Added basic test case
--HG--
branch : pmitros-mod-template
|
2012-02-11 09:31:03 -05:00 |
|
Piotr Mitros
|
cbc020785a
|
Semi-generic registration mechanism for modules. Still need to clean up references in content_parser
--HG--
branch : pmitros-mod-template
|
2012-02-11 08:20:43 -05:00 |
|
Piotr Mitros
|
39011ce011
|
Book module works
--HG--
branch : pmitros-mod-template
|
2012-02-11 00:01:19 -05:00 |
|
David Ormsbee
|
a50d3d7f91
|
changed ADMIN email to admin@mitx.mit.edu
|
2012-02-10 18:58:35 -05:00 |
|
Piotr Mitros
|
091a45dc0c
|
Removed random debug code
|
2012-02-10 16:57:01 -05:00 |
|
Bridger Maxwell
|
a8c32923dc
|
Rotated the profile graph labels, so the all fit
--HG--
branch : bridger-dev
|
2012-02-10 15:57:57 -05:00 |
|
Piotr Mitros
|
dae8420456
|
Support for static pages added
|
2012-02-10 13:38:44 -05:00 |
|
Bridger Maxwell
|
1b6f058851
|
Added bar on progress graph to show overall grade.
--HG--
branch : bridger-dev
|
2012-02-10 12:18:08 -05:00 |
|
Bridger Maxwell
|
b2c89cffff
|
Added documentation for wikipath
|
2012-02-09 15:22:46 -05:00 |
|
Bridger Maxwell
|
012e51811a
|
Fixed wikipath extension
|
2012-02-09 15:18:19 -05:00 |
|
Bridger Maxwell
|
fd7f229ae1
|
Cleaning up profile to output better lists
--HG--
branch : mitx-profilecleanup
|
2012-02-09 14:55:20 -05:00 |
|
Bridger Maxwell
|
ea39249566
|
Disabled wikipath markdown extension, as it requires markdown 2.1.0, and we are running 2.0.3
|
2012-02-08 22:20:46 -05:00 |
|
Bridger Maxwell
|
b1377f6c4e
|
Merge. Also, for last commit I added sorting to the wiki 'all articles' but forgot to put it into commit message.
|
2012-02-08 21:40:27 -05:00 |
|
Bridger Maxwell
|
159af57995
|
Removed codehilite from wiki. It was throwing errors and wasn't used. Should be fixed later?
|
2012-02-08 21:37:24 -05:00 |
|