Kyle Fiedler
|
cca5fe2f04
|
Delete page
|
2012-08-22 15:40:56 -04:00 |
|
Kyle Fiedler
|
f4f8b7bf73
|
Added delete page and padding and hid th on overflow
|
2012-08-22 15:39:24 -04:00 |
|
Kyle Fiedler
|
7464332180
|
added fix for error styles and swapped some the button order
|
2012-08-22 15:09:20 -04:00 |
|
Kyle Fiedler
|
1277c5f892
|
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
|
2012-08-22 14:43:15 -04:00 |
|
Kyle Fiedler
|
d0c92aa159
|
Added styles for the wiki directory
|
2012-08-22 14:43:03 -04:00 |
|
Bridger Maxwell
|
788c74e07a
|
Added optional <wiki> tag to course to specify an alternative wiki page.
|
2012-08-22 14:25:05 -04:00 |
|
Kyle Fiedler
|
02f29c22c9
|
Added stsyles for toc
|
2012-08-22 13:41:20 -04:00 |
|
Bridger Maxwell
|
14382702bc
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
lms/templates/wiki/settings.html
|
2012-08-22 13:09:42 -04:00 |
|
Calen Pennington
|
aa933cb38f
|
Merge pull request #497 from MITx/feature/victor/catch-module-errors
Catch errors in module load
|
2012-08-22 10:05:08 -07:00 |
|
David Ormsbee
|
6a0072a0fb
|
Merge pull request #483 from MITx/feature/tomg/fall-design
Feature/tomg/fall design
|
2012-08-22 10:04:12 -07:00 |
|
Victor Shnayder
|
365495521e
|
Catch errors in module load
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
|
2012-08-22 12:58:46 -04:00 |
|
Bridger Maxwell
|
7b4c86e55c
|
Updated django-wiki with bug fix.
|
2012-08-22 12:42:21 -04:00 |
|
Bridger Maxwell
|
3796bb4a12
|
Changed title of default root wiki page to just be Wiki.
|
2012-08-22 12:42:03 -04:00 |
|
Tom Giannattasio
|
fb1d9ca06c
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-22 11:41:19 -04:00 |
|
Tom Giannattasio
|
7d903c4089
|
sidebar hover and firefox bug fixes
|
2012-08-22 11:40:59 -04:00 |
|
Calen Pennington
|
f065959f8a
|
Merge pull request #495 from MITx/feature/arjun/fix_syllabus_css
Fixed syllabus to look good with new courseware styling
|
2012-08-22 08:39:00 -07:00 |
|
Bridger Maxwell
|
390823bdea
|
Added django-wiki's requirements to requirements.txt, because they weren't being included automatically.
|
2012-08-22 11:37:01 -04:00 |
|
Bridger Maxwell
|
96f0f7cbde
|
Changed default contents of new course wiki.
|
2012-08-22 11:36:06 -04:00 |
|
Bridger Maxwell
|
03248cc324
|
Updated django-wiki.
|
2012-08-22 10:09:06 -04:00 |
|
Tom Giannattasio
|
b7ce475adb
|
accordion hovers
|
2012-08-22 09:35:17 -04:00 |
|
Tom Giannattasio
|
8344fe88bd
|
removed funky footer logo animation
|
2012-08-22 09:08:42 -04:00 |
|
Tom Giannattasio
|
885efc47c4
|
darker background for increased contrast
|
2012-08-22 09:03:38 -04:00 |
|
Arjun Singh
|
a9126aa276
|
Fixed syllabus to look good with new courseware styling
|
2012-08-22 05:25:48 -07:00 |
|
Tom Giannattasio
|
7e645e7f91
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-22 07:35:26 -04:00 |
|
Tom Giannattasio
|
441d1955f9
|
fixed anonymous header bug
|
2012-08-22 07:34:55 -04:00 |
|
Bridger Maxwell
|
723519ee74
|
Removed wiki/settings.html so the default one will be used.
|
2012-08-22 00:55:03 -04:00 |
|
Bridger Maxwell
|
a285d1a60e
|
Updated wiki preview template and django-wiki version.
|
2012-08-22 00:07:37 -04:00 |
|
Bridger Maxwell
|
eb62b80fca
|
Updated django-wiki with another deletion bug fix.
|
2012-08-21 23:46:26 -04:00 |
|
Bridger Maxwell
|
9162bdb1b9
|
Changed wiki setting so article owners can't change permissions.
|
2012-08-21 23:06:45 -04:00 |
|
Bridger Maxwell
|
c77d718703
|
Updated django-wiki with delete article bug.
|
2012-08-21 22:58:07 -04:00 |
|
Bridger Maxwell
|
9e81ea3981
|
Added instructor tabs to wiki course nav.
|
2012-08-21 22:31:13 -04:00 |
|
Bridger Maxwell
|
e655b4a3b3
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
cms/static/sass/_base.scss
repo-requirements.txt
|
2012-08-21 22:25:21 -04:00 |
|
Bridger Maxwell
|
82d414690b
|
Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled.
|
2012-08-21 22:23:40 -04:00 |
|
David Ormsbee
|
9bcd3cd495
|
Merge pull request #490 from MITx/feature/rocky/discussion_api_key
Feature/rocky/discussion api key
|
2012-08-21 17:09:26 -07:00 |
|
Tom Giannattasio
|
202eb7b1e9
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-21 19:26:10 -04:00 |
|
Tom Giannattasio
|
bbc95cb589
|
fixed accordion nav glitch
|
2012-08-21 19:25:32 -04:00 |
|
David Ormsbee
|
f7539e8bce
|
Merge pull request #488 from MITx/kimth/fix-choiceresponse
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
|
2012-08-21 15:46:32 -07:00 |
|
Rocky Duan
|
e3a3f7094a
|
added shared key authentication
|
2012-08-21 15:45:41 -07:00 |
|
Rocky Duan
|
fe091b7bc1
|
Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key
|
2012-08-21 15:45:24 -07:00 |
|
Bridger Maxwell
|
214fb9185d
|
Disabling anonymous wiki access until styling supports it.
|
2012-08-21 18:42:20 -04:00 |
|
Tom Giannattasio
|
88505b3948
|
fixed discussion sidebar
|
2012-08-21 18:41:06 -04:00 |
|
Tom Giannattasio
|
bd536f8aec
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-21 18:13:40 -04:00 |
|
David Ormsbee
|
f9d27fd760
|
Merge pull request #489 from MITx/feature/bridger/disable_wiki_attachments
Disabled wiki attachments.
|
2012-08-21 15:13:29 -07:00 |
|
Tom Giannattasio
|
e762844c35
|
new sequence nav functionality - accommodates an infinite number of items
|
2012-08-21 18:12:59 -04:00 |
|
Bridger Maxwell
|
1e068b6a4a
|
Disabled wiki attachments.
|
2012-08-21 18:01:51 -04:00 |
|
kimth
|
f83169f12d
|
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
|
2012-08-21 17:54:21 -04:00 |
|
Bridger Maxwell
|
41831654ee
|
Added link to see wiki attachment history.
|
2012-08-21 17:44:38 -04:00 |
|
Victor Shnayder
|
2c19d01441
|
Merge pull request #479 from MITx/feature/arjun/syllabus
Adding a syllabus page (accessible via course navigation)
|
2012-08-21 14:33:07 -07:00 |
|
kimth
|
cfa2ba95bc
|
Merge pull request #485 from MITx/feature/kfiedler/courseware-style
Fix for CSM Sass and fix headers in tutorials
|
2012-08-21 14:17:20 -07:00 |
|
Bridger Maxwell
|
954ee6ab1f
|
Added link to list children of an article. Upgraded django-wiki version.
|
2012-08-21 17:09:24 -04:00 |
|