Bridger Maxwell
|
b694183db0
|
Merge
|
2012-01-23 12:55:53 -05:00 |
|
Bridger Maxwell
|
499ff9a97e
|
Changed structure of wiki so that the base article is just '/'
--HG--
branch : bridgerwiki
|
2012-01-23 12:41:26 -05:00 |
|
Piotr Mitros
|
ef1c465d5e
|
Video module set up to store last location. Several bug fixes too.
|
2012-01-23 09:15:59 -05:00 |
|
Piotr Mitros
|
d989621bff
|
Series remembers last spot
|
2012-01-21 23:52:46 -05:00 |
|
Piotr Mitros
|
29d23d1594
|
Accidentally left in a print
|
2012-01-21 18:50:51 -05:00 |
|
Piotr Mitros
|
ba2c03357c
|
All modules moved into new OO framework
|
2012-01-21 18:46:34 -05:00 |
|
Piotr Mitros
|
16ab1bb564
|
Vertical Module is now an x_module
|
2012-01-21 15:25:25 -05:00 |
|
Piotr Mitros
|
837e87e177
|
Modules moved into their own directory
--HG--
rename : courseware/capa_module.py => courseware/modules/capa_module.py
rename : courseware/html_module.py => courseware/modules/html_module.py
rename : courseware/schematic_module.py => courseware/modules/schematic_module.py
rename : courseware/video_module.py => courseware/modules/video_module.py
rename : courseware/x_module.py => courseware/modules/x_module.py
|
2012-01-21 13:21:50 -05:00 |
|
Piotr Mitros
|
d410d8294a
|
All elements in course file include IDs
|
2012-01-21 12:47:30 -05:00 |
|
Piotr Mitros
|
714167322e
|
course_file now includes parsing.
|
2012-01-21 12:36:52 -05:00 |
|
Piotr Mitros
|
829e890a6e
|
Very minor cleanups
|
2012-01-21 12:24:17 -05:00 |
|
Piotr Mitros
|
1ec3209d05
|
Moved courseware from minidom to lxml2. Appears to work, but big change. may still have bugs.
|
2012-01-21 12:12:00 -05:00 |
|
Piotr Mitros
|
8539b9264f
|
Profile page uses lxml
|
2012-01-21 09:20:24 -05:00 |
|
Piotr Mitros
|
591f902372
|
Content parser moved to lxml
|
2012-01-20 18:54:14 -05:00 |
|
Piotr Mitros
|
958426020d
|
Two content_parser modules by accident
|
2012-01-20 18:01:15 -05:00 |
|
Piotr Mitros
|
97ebb75046
|
Accidentally switched to wrong settings
|
2012-01-20 15:04:15 -05:00 |
|
Piotr Mitros
|
bddfe16e37
|
Placeholder pages for TOS, privacy, honor code
|
2012-01-20 14:58:32 -05:00 |
|
cjt
|
1b4d400cdd
|
lab support
|
2012-01-20 14:18:53 -05:00 |
|
Ernie Park
|
6660646f9c
|
commented out middleware requirement for pagesize which is no longer in the new devel middleware
|
2012-01-20 12:49:53 -05:00 |
|
David Ormsbee
|
4474de49b4
|
restore adding askbot-devel to the pythonpath
|
2012-01-20 11:24:32 -05:00 |
|
David Ormsbee
|
7de2c6fab1
|
update settings to remove server split between askbot and courseware
|
2012-01-20 10:56:20 -05:00 |
|
Piotr Mitros
|
4bc58c5611
|
Option for new Askbot
--HG--
rename : settings.py => settings_old_askbot.py
|
2012-01-19 16:31:40 -05:00 |
|
Bridger Maxwell
|
fa39e96903
|
Merge
|
2012-01-18 23:27:59 -05:00 |
|
Bridger Maxwell
|
d47d95edf2
|
Removed simplewiki's custom 404 page so urls work better, and it uses global 404 page. Set bad debug setting to false
|
2012-01-18 21:43:23 -05:00 |
|
David Ormsbee
|
9619bf20ea
|
moved logging level to INFO, replaced tabs with spaces in settings.py
|
2012-01-18 15:00:46 -05:00 |
|
Piotr Mitros
|
4e75a04ffa
|
Problem tracking appears to work
|
2012-01-18 14:17:06 -05:00 |
|
Piotr Mitros
|
b0bbfc1b81
|
Fixed my own error in above
|
2012-01-18 13:14:16 -05:00 |
|
Piotr Mitros
|
a25b247849
|
Fixed bridger's bug in adding to settings.py instead of his local
|
2012-01-18 13:13:27 -05:00 |
|
Piotr Mitros
|
8c979717cc
|
Merge
|
2012-01-17 21:36:51 -05:00 |
|
Piotr Mitros
|
028dac5491
|
Info tab
|
2012-01-17 21:28:23 -05:00 |
|
Bridger Maxwell
|
5c11bcd0c9
|
Merge
|
2012-01-17 19:03:05 -05:00 |
|
Bridger Maxwell
|
eb532d0d51
|
The 'not found' wiki page now has a working 'create article' link
|
2012-01-17 19:02:43 -05:00 |
|
Piotr Mitros
|
9155eedda3
|
manage.py has execute permissions
|
2012-01-17 13:39:49 -05:00 |
|
Piotr Mitros
|
9682aea995
|
Stupid typo in settings.py
|
2012-01-16 21:34:16 -05:00 |
|
Piotr Mitros
|
5859f466ec
|
Run without courseware with --settings
|
2012-01-16 20:39:50 -05:00 |
|
Piotr Mitros
|
851bf3e692
|
Fixed revery in settings.py
|
2012-01-16 18:19:27 -05:00 |
|
Piotr Mitros
|
1fb47e9cdd
|
settings.py had textbook. Worked on dev machines because .pyc files stuck around; didn't work on staging
|
2012-01-16 15:58:50 -05:00 |
|
Piotr Mitros
|
3ddddbe5c3
|
merge
|
2012-01-16 12:33:43 -05:00 |
|
Piotr Mitros
|
56c81a07fd
|
Fixed -.33 bug in calculator from gjs
|
2012-01-16 12:33:29 -05:00 |
|
Bridger Maxwell
|
d909e89104
|
Added setting to generate random user credentials to test account creation. Might have accidentally stomped other changes to settings.py
|
2012-01-16 11:48:45 -05:00 |
|
Piotr Mitros
|
d65d268045
|
Fixed two minor errors. setting -> settings, default PERF_STATS in settings.py
--HG--
rename : setting_no_askbot.py => settings_no_askbot.py
|
2012-01-16 11:38:41 -05:00 |
|
Piotr Mitros
|
86bc89fd23
|
We can now manage.py runserver --settings=setting_no_askbot
|
2012-01-16 11:34:41 -05:00 |
|
Bridger Maxwell
|
bd52b9e419
|
Changed perfstats middleware to log sql queries
|
2012-01-15 16:47:22 -05:00 |
|
Bridger Maxwell
|
82cbb9a1d1
|
Matched stop and start calls in perf middleware.
|
2012-01-15 16:15:32 -05:00 |
|
Piotr Mitros
|
6e9e9c7627
|
Slightly better name. PROFILE to PERFSTATS
|
2012-01-15 14:13:40 -05:00 |
|
Piotr Mitros
|
36281387d6
|
Profiling. Also, preliminary dummy code for tracking in capa_problem
|
2012-01-15 14:12:46 -05:00 |
|
Piotr Mitros
|
2b4c8e751b
|
Merge
|
2012-01-14 11:09:38 -08:00 |
|
Piotr Mitros
|
e3e1f1fafa
|
Removed old, HTML-style textbook
|
2012-01-14 07:36:38 -05:00 |
|
Piotr Mitros
|
930feb590d
|
Merge
|
2012-01-14 07:34:32 -05:00 |
|
Piotr Mitros
|
b118f4361c
|
Tracking improvements. Calculator is tracked
|
2012-01-14 07:33:43 -05:00 |
|