Tom Giannattasio
|
f67a356466
|
added additional bootstrap js files
|
2012-08-17 14:14:07 -04:00 |
|
David Ormsbee
|
9806deee38
|
Add proxy rule for wiki for local testing of split servers
|
2012-08-17 14:05:38 -04:00 |
|
Tom Giannattasio
|
b5b5978130
|
started styling attachments page
|
2012-08-17 13:32:40 -04:00 |
|
ichuang
|
39e2d64207
|
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate
|
2012-08-17 16:22:40 +00:00 |
|
ichuang
|
4365b4a092
|
more flexible event logs retrieval
|
2012-08-17 16:17:00 +00:00 |
|
ichuang
|
7dd7de9566
|
add gitreload to lms migration, so it doesn't have to run separately
|
2012-08-17 15:57:12 +00:00 |
|
ichuang
|
5300670076
|
Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver
merging now so it stops holding up content teams.
|
2012-08-17 06:39:57 -07:00 |
|
Tom Giannattasio
|
ad45a44a7c
|
added bootstrap js and other dependencies; tweaked settings template
|
2012-08-17 09:37:42 -04:00 |
|
ichuang
|
4dbcfe927e
|
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver
This needs a more permanent solution.
|
2012-08-17 09:36:43 -04:00 |
|
Calen Pennington
|
b0627efc74
|
Fix the tests of the book url
|
2012-08-17 09:23:37 -04:00 |
|
Calen Pennington
|
427c400f9e
|
Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus
Fix user replication to Courses you're already enrolled in
|
2012-08-17 05:55:31 -07:00 |
|
Calen Pennington
|
502691fa6e
|
Merge pull request #441 from MITx/feature/halogenandtoast/fix_scroll
Add jQuery scrollTo to courseware.
|
2012-08-17 05:54:51 -07:00 |
|
ichuang
|
879fb0db0c
|
Merge pull request #445 from MITx/kimth/sjsu
Fix CustomResponse for 6.002x
changes affect 6.002 model of customresponse, making it slightly more robust when improperly used.
|
2012-08-16 19:13:52 -07:00 |
|
kimth
|
0a9065f2be
|
Fix CustomResponse for 6.002x
|
2012-08-16 22:00:10 -04:00 |
|
Bridger Maxwell
|
df79f84c33
|
Fixed static includes in wiki django templates.
|
2012-08-16 19:41:04 -04:00 |
|
David Ormsbee
|
61108c27cb
|
When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models
|
2012-08-16 19:12:57 -04:00 |
|
kimth
|
bea9aec6ea
|
Merge pull request #443 from MITx/feature/victor/fix-html-rendering
fix another backcompat html bug
|
2012-08-16 15:00:37 -07:00 |
|
Victor Shnayder
|
7e69c35735
|
fix another backcompat html bug
|
2012-08-16 17:58:10 -04:00 |
|
kimth
|
9686868a32
|
Merge pull request #442 from MITx/feature/kfiedler/courseware-style
Added fix for answer status and show answer to stay in the same place
|
2012-08-16 14:51:43 -07:00 |
|
Kyle Fiedler
|
f343bc28f3
|
Added fix for answer status and show answer to stay in the same place
|
2012-08-16 17:49:50 -04:00 |
|
Tom Giannattasio
|
b0b10aa598
|
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
|
2012-08-16 17:35:56 -04:00 |
|
Bridger Maxwell
|
2de55d074b
|
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
|
2012-08-16 17:34:38 -04:00 |
|
Bridger Maxwell
|
385772373a
|
Updated django-wiki requirement with fixed version.
|
2012-08-16 17:32:11 -04:00 |
|
Tom Giannattasio
|
490eb7a32b
|
styled changes, new article and delete pages
|
2012-08-16 17:31:05 -04:00 |
|
kimth
|
c56fb6f326
|
Merge pull request #440 from MITx/feature/kfiedler/courseware-style
BUG SMASH
|
2012-08-16 14:12:45 -07:00 |
|
David Ormsbee
|
b5c6053000
|
Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2
{} -> {0} etc in .format statements
|
2012-08-16 14:11:25 -07:00 |
|
Kyle Fiedler
|
09973bd815
|
Added fix for circut simulator
|
2012-08-16 17:08:12 -04:00 |
|
Matthew Mongeau
|
409477522b
|
Add jQuery scrollTo to courseware.
|
2012-08-16 17:07:43 -04:00 |
|
kimth
|
fa3e46880d
|
Merge pull request #439 from MITx/feature/victor/fix-html-rendering
fix html rendering bug
|
2012-08-16 14:02:10 -07:00 |
|
Victor Shnayder
|
1ae71313bc
|
fix html rendering bug
|
2012-08-16 16:53:29 -04:00 |
|
Rocky Duan
|
c89e290cdd
|
use only one conf param
|
2012-08-16 13:43:48 -07:00 |
|
Tom Giannattasio
|
bb6d6d9ac8
|
edit page styles
|
2012-08-16 16:41:41 -04:00 |
|
Rocky Duan
|
730d4d9485
|
add askbot flag back
|
2012-08-16 13:40:12 -07:00 |
|
ichuang
|
6e3eff304e
|
{} -> {0} etc in .format statements
|
2012-08-16 16:22:26 -04:00 |
|
Calen Pennington
|
97538e7077
|
Merge pull request #437 from MITx/feature/ichuang/minor-py26-compat-fix
Fix backcompat_module : html escape & py26
|
2012-08-16 12:36:51 -07:00 |
|
Calen Pennington
|
f09fa831d8
|
Merge pull request #436 from MITx/kimth/sjsu
Hide chapters in addition to sections
|
2012-08-16 12:32:21 -07:00 |
|
Kyle Fiedler
|
b17cbcdccd
|
Added fixes for speed dropdown
|
2012-08-16 15:27:23 -04:00 |
|
ichuang
|
73d9d10aa8
|
html needs < in backcompat_module
|
2012-08-16 15:17:55 -04:00 |
|
ichuang
|
0cac6c9512
|
minor change to backcompat_module for py26 compat
|
2012-08-16 15:16:42 -04:00 |
|
kimth
|
9acb1ddaca
|
Hide chapters in addition to sections
|
2012-08-16 15:06:49 -04:00 |
|
ichuang
|
ea03838a0f
|
Merge pull request #434 from MITx/sarina/max-attempts-fix
Add facility for fixed number of problem attempts
|
2012-08-16 11:57:30 -07:00 |
|
Sarina Canelake
|
725e9a2a7b
|
Add facility for fixed number of problem attempts
|
2012-08-16 14:27:28 -04:00 |
|
Victor Shnayder
|
147bd5eb3d
|
add initial docs on xml format and policy files
|
2012-08-16 14:04:41 -04:00 |
|
Calen Pennington
|
56fc4e2fe8
|
Merge pull request #433 from MITx/feature/kfiedler/courseware-style
Made video go to the center of the screen in full screen
|
2012-08-16 10:52:27 -07:00 |
|
Calen Pennington
|
4e9e65e0e1
|
Merge pull request #432 from MITx/feature/cale/fix-tests
Move mitxmako out of common lib, and pass template rendering function in...
|
2012-08-16 10:52:12 -07:00 |
|
Kyle Fiedler
|
c2ee844704
|
Made video go to the center of the screen in full screen
|
2012-08-16 13:47:15 -04:00 |
|
Calen Pennington
|
4798a46948
|
Add docstring for load_function
|
2012-08-16 13:08:10 -04:00 |
|
Bridger Maxwell
|
9411bdaaa2
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
|
2012-08-16 13:02:00 -04:00 |
|
Bridger Maxwell
|
034bd7308e
|
The django/mako template loader now caches mako templates by loading them from file.
|
2012-08-16 13:01:04 -04:00 |
|
Calen Pennington
|
3b36fbf914
|
Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore
|
2012-08-16 12:49:42 -04:00 |
|