Tom Giannattasio
1bd790fabb
finished attachment styles
2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297
added modal functionality for attachments page
2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35
added CodeMirror styles for the circuit editor
2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb
added Code Mirror styles
2012-08-17 15:10:24 -04:00
Tom Giannattasio
af06dd948d
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-17 14:53:12 -04:00
Bridger Maxwell
90eeaa0538
Updated django-wiki requirement.
2012-08-17 14:52:54 -04:00
Tom Giannattasio
411fcfd0cd
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-17 14:50:44 -04:00
Tom Giannattasio
1411c0e066
started tweaking upload interface
2012-08-17 14:50:40 -04:00
Bridger Maxwell
b05bace12a
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
...
Conflicts:
lms/templates/wiki/base.html
2012-08-17 14:48:06 -04:00
Tom Giannattasio
e96a5fcbee
started attachments rework
2012-08-17 14:44:27 -04:00
Bridger Maxwell
8595cb24b2
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
...
Conflicts:
lms/templates/wiki/base.html
2012-08-17 14:44:25 -04:00
Bridger Maxwell
6b716c2883
Put in CodeMirror editor with inline circuits.
2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466
added additional bootstrap js files
2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130
started styling attachments page
2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c
added bootstrap js and other dependencies; tweaked settings template
2012-08-17 09:37:42 -04:00
Bridger Maxwell
df79f84c33
Fixed static includes in wiki django templates.
2012-08-16 19:41:04 -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
Tom Giannattasio
bb6d6d9ac8
edit page styles
2012-08-16 16:41:41 -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
9118e585cc
Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks
...
Feature/halogenandtoast/multiple textbooks
2012-08-16 09:47:53 -07:00
Calen Pennington
73623ed92b
Merge pull request #431 from MITx/feature/kfiedler/askbot
...
MAnage askbot images
2012-08-16 09:10:02 -07:00
Matthew Mongeau
ae3cb4ec7b
Nest textbooks under data
2012-08-16 12:06:37 -04:00
Kyle Fiedler
24ed4a4dae
MAnage images
2012-08-16 12:06:20 -04:00
Calen Pennington
6bca6cdc28
Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser
...
Fix bug preventing comments from being in course.xml
2012-08-16 09:06:14 -07:00
Calen Pennington
919b3e2137
Merge pull request #429 from MITx/feature/victor/strip-metadata
...
Feature/victor/strip metadata
2012-08-16 08:52:23 -07:00
Matthew Mongeau
4ff80287f7
Remove TextbookDescriptor from setup.
2012-08-16 11:52:10 -04:00
ichuang
7553dac2f3
etree parser needs to be set on each call in modulestore load_course
2012-08-16 11:50:04 -04:00
Matthew Mongeau
945632362b
Get rid of TextbookModule and TextbookDescriptor.
2012-08-16 11:49:03 -04:00
Victor Shnayder
61478f4ba0
fix string format bug
2012-08-16 11:46:56 -04:00
Victor Shnayder
c02313a099
hackish cleanup script
2012-08-16 11:43:40 -04:00
Victor Shnayder
00d9ecd600
New policy organization:
...
* course roots live in roots/{url_name}.xml
- one is linked from course.xml
* policies live in policies/url_name.json
- loaded based on course url_name
* Updated to pass policy through into xml parsing, so it takes effect
before descriptor constructors are called.
* Update toy test course to new structure, fix up tests
2012-08-16 11:41:19 -04:00
Victor Shnayder
691744e359
Use .display_name instead of metadata['display_name']
...
* the former does a fallback if metadata['display_name'] isn't set.
2012-08-16 11:37:54 -04:00
Victor Shnayder
5e2f676153
backcompat warnings
2012-08-16 11:36:05 -04:00
Calen Pennington
053d52e893
Merge pull request #420 from MITx/feature/kfiedler/courseware-style
...
Added styles to grade out the top and bottom of the sidebar border and f...
2012-08-16 08:33:29 -07:00
Kyle Fiedler
7f72004b50
Fix conflicts
2012-08-16 11:33:05 -04:00
Kyle Fiedler
ad7061e41f
Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav
2012-08-16 11:33:05 -04:00
Calen Pennington
4653eebdc3
Merge pull request #428 from MITx/kimth/xqueue_callback_blocking
...
Kimth/xqueue callback blocking
2012-08-16 08:31:22 -07:00
kimth
909a368f4a
Merge branch 'master' into kimth/xqueue_callback_blocking
2012-08-16 11:27:56 -04:00
kimth
1bb8d9366d
Xqueue URL is https not http
2012-08-16 11:27:29 -04:00
Calen Pennington
a3b144045c
Merge pull request #427 from MITx/feature/bridger/new_wiki
...
New wiki installed from pip
2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71
Removed old path include for django-wiki.
2012-08-16 10:56:33 -04:00
Bridger Maxwell
337f109af7
Moved django-wiki submodule to be a pip install from git.
2012-08-16 10:54:34 -04:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Matthew Mongeau
4a7b163ce3
Keep textbooks out of displayable items.
2012-08-16 10:31:18 -04:00
Matthew Mongeau
34010a38a8
Fix textbook module.
2012-08-16 10:31:17 -04:00
Matthew Mongeau
ae09598d9a
Display textbooks in course navigation, handle in urls and views.
2012-08-16 10:31:17 -04:00
