Commit Graph

58450 Commits

Author SHA1 Message Date
Piotr Mitros
8b4efadfd8 Profile page path issue 2012-01-24 14:54:52 -05:00
Piotr Mitros
7971a02832 Previous change introduced a bug where Django's ORM would insert instead of update. Momentary revert. 2012-01-24 13:58:02 -05:00
Piotr Mitros
94a5c75088 Stage still needs old Askbot. Broken schema migrations. 2012-01-24 11:55:51 -05:00
Kyle Fiedler
3d39a7ac76 compiled css 2012-01-24 11:36:45 -05:00
Kyle Fiedler
23b5cf6691 Added new style and html for honor code on enroll form 2012-01-24 11:32:39 -05:00
Kyle Fiedler
2eb6fd0469 Added some styles for help 2012-01-24 10:34:42 -05:00
Kyle Fiedler
b2bcf6b2ac Fixed change language and location bugs 2012-01-24 10:27:46 -05:00
Kyle Fiedler
ce6b84196c merge 2012-01-24 09:53:48 -05:00
Kyle Fiedler
9a527344f4 started to fix javascript issues 2012-01-24 09:51:58 -05:00
Reda Lemeden
8b3acb3448 Added a discussion stylesheet and linked to it in application.scss 2012-01-24 09:20:38 -05:00
Piotr Mitros
acafd3f66c Nasty bug fixes in when we can render. Need to apply to vertical too 2012-01-23 23:38:02 -05:00
Piotr Mitros
f3eb22e0e9 working on import issues 2012-01-23 23:24:30 -05:00
Piotr Mitros
150fbc80bb Fully qualified path in import. Attempting to debug staging problem 2012-01-23 22:57:56 -05:00
Piotr Mitros
17a0c1e186 New hgignore. Ignore this commit 2012-01-23 22:45:53 -05:00
Piotr Mitros
7ebdd04d57 Stupid infrastructure for benchmarking 2012-01-23 22:37:35 -05:00
Piotr Mitros
4442754a86 Redundant DB queries eliminated. We're at about 5 hits per sequence w/o Askbot, and 10 with 2012-01-23 22:02:36 -05:00
Piotr Mitros
98e9d96cc9 Fixed revert 2012-01-23 18:46:21 -05:00
Piotr Mitros
e982418a3d Merge 2012-01-23 18:37:23 -05:00
Piotr Mitros
b2d5c680ec Adding fixture for pmitros@csail.mit.edu 2012-01-23 18:37:07 -05:00
David Ormsbee
faae6b5979 merging changes from wiki 2012-01-23 18:29:33 -05:00
David Ormsbee
28bc63f108 added logging setup for settings_new_askbot.py 2012-01-23 18:27:25 -05:00
Bridger Maxwell
07f328f67f merge 2012-01-23 18:12:42 -05:00
Bridger Maxwell
7200ca0d0c Update to simplewiki 2012-01-23 18:12:29 -05:00
Bridger Maxwell
608fa17983 Adding delete functionality
--HG--
branch : bridgerwiki
2012-01-23 18:05:16 -05:00
Bridger Maxwell
7e177fc66b Merge
--HG--
branch : bridgerwiki
2012-01-23 17:56:46 -05:00
David Ormsbee
dda9290889 Simple logging so we can test loggers on staging. 2012-01-23 16:34:17 -05:00
Bridger Maxwell
81e70347d5 merge 2012-01-23 15:43:20 -05:00
fischerl
b9cd444682 added more subs 2012-01-23 14:38:36 -05:00
Bridger Maxwell
f2f6f0c14b Wiki redirection bug fix
--HG--
branch : bridgerwiki
2012-01-23 13:31:13 -05:00
David Ormsbee
b8087c10f9 rearrange imports 2012-01-23 13:29:12 -05:00
Piotr Mitros
01fbbb9fc7 Merge 2012-01-23 13:26:15 -05:00
Bridger Maxwell
5227734fae merge 2012-01-23 13:05:07 -05:00
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
747f5ac290 Switching to new Askbot 2012-01-23 12:35:37 -05:00
Piotr Mitros
11f3012214 Bug fix in profile page 2012-01-23 12:20:25 -05:00
Piotr Mitros
25cb46731d Sequential module stores position. Basic groundwork to make video module do the same 2012-01-23 09:16:35 -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