Kyle Fiedler
24ed4a4dae
MAnage images
2012-08-16 12:06:20 -04: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
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
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
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
ae09598d9a
Display textbooks in course navigation, handle in urls and views.
2012-08-16 10:31:17 -04:00
Calen Pennington
e60f2e3d3d
Merge pull request #422 from MITx/kimth/sjsu
...
Don't display 'None points' on problem rendering
2012-08-16 07:14:28 -07:00
thomasxiii
1a8e5485eb
Merge pull request #416 from MITx/feature/kfiedler/askbot
...
Fix all of askbots style
2012-08-16 07:02:39 -07:00
kimth
da9a4710ce
Merge branch 'master' into kimth/xqueue_callback_blocking
2012-08-16 09:38:25 -04:00
Bridger Maxwell
326a0f61c1
Updated django-wiki submodule.
2012-08-15 23:43:05 -04:00
Bridger Maxwell
d064d29cd8
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-15 23:01:27 -04:00
Bridger Maxwell
8fb83ee33c
Added django-wiki as a submodule.
2012-08-15 23:01:06 -04:00
Bridger Maxwell
2b29c95266
Added template for inline preview.
2012-08-15 21:47:26 -04:00
Bridger Maxwell
262a49a6da
Permissions on root article no longer allow students to edit it.
2012-08-15 21:47:08 -04:00
Rocky Duan
449da71cd9
fixed vote permission
2012-08-15 18:04:56 -07:00
Bridger Maxwell
48e9dc8031
Added bootstrap-modal for the wiki preview modals.
2012-08-15 20:07:05 -04:00
Bridger Maxwell
a163b486ac
Fixed up course_nav to swizzle url reversing too.
2012-08-15 19:34:42 -04:00
Bridger Maxwell
e76be095e9
Middleware for changing redirects to stay in course wiki.
2012-08-15 18:54:22 -04:00
Bridger Maxwell
0d28d286e2
Added creation of Site() object on wiki load.
2012-08-15 18:54:01 -04:00
Rocky Duan
051afcca6a
Merge branch 'ccp0101/performance' of github.com:dementrock/mitx
2012-08-15 15:47:25 -07:00
Rocky Duan
1a92cc5c3f
callback for models
2012-08-15 15:46:58 -07:00
Mike Chen
d56ac9a71b
added comment
2012-08-15 17:22:09 -04:00
Mike Chen
158e978a7e
added naive caching. not sure how to expire.
2012-08-15 17:15:08 -04:00
kimth
3519ea6b2f
Don't display 'None points' on problem rendering
2012-08-15 17:14:27 -04:00
Mike Chen
2454c06b08
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
2012-08-15 16:14:17 -04:00
Tom Giannattasio
13c2bb588e
added styles for main article, sidebar and breadcrumb
2012-08-15 15:59:46 -04:00
kimth
58932bb2f7
Drop import of re
2012-08-15 15:23:14 -04:00
kimth
3c1e67e339
Merge master
2012-08-15 15:19:08 -04:00
Calen Pennington
13b9e58f8f
Merge pull request #419 from MITx/feature/url_based_course_lists
...
URL based course lists
2012-08-15 12:07:02 -07:00
Calen Pennington
213e3cdc7c
Merge pull request #418 from MITx/feature/victor/strip-metadata
...
Feature/victor/strip metadata
2012-08-15 12:01:58 -07:00
kimth
02d970c31e
Map '/course/' urls to the course's root in the multicourse hierarchy
2012-08-15 14:45:12 -04:00
David Ormsbee
1c2b6e8088
Remove stuff that I should have deleted during the rebase
2012-08-15 14:39:56 -04:00
Rocky Duan
f7f6164351
slight styling adjustment
2012-08-15 11:36:14 -07:00
Victor Shnayder
a4d67bab33
Add support metadata in policy.json
...
* if there is a policy.json in the course dir, read it
* file format is a dict with keys {category}/{url_name}, and values metadata dictionaries
* apply the policy, overwriting keys that are in the xml
* then do metadata inheritance, inheriting any overwritten keys.
* also a management cmd to generate a policy.json from a course dir.
2012-08-15 14:36:06 -04:00
David Ormsbee
f535f44e62
Fix typo that caused two classes to not get loaded
2012-08-15 14:32:36 -04:00
kimth
f1f80cb1f4
Drop HttpResponseRedirect import
2012-08-15 14:26:41 -04:00
Rocky Duan
7335c1529e
show all content in a course in the forum view
2012-08-15 11:21:31 -07:00
kimth
0b4b8ecfdc
courseware.get_module passes down course_id triplet (org, course, run)
2012-08-15 14:20:35 -04:00
Calen Pennington
e524f3bf6c
Point at the new urls for the sandbox queue server LB
2012-08-15 14:12:32 -04:00
Calen Pennington
573c58d02b
Fix broken docstring
2012-08-15 13:59:25 -04:00
Kyle Fiedler
6d7225bebb
Added some final touches to askbot
2012-08-15 13:51:10 -04:00
Kyle Fiedler
ff1f090737
Added more fixes for askbot also fixed some of the extra padding
2012-08-15 13:51:10 -04:00
Kyle Fiedler
0804ff7a75
Added styles for single question and profile view
2012-08-15 13:51:10 -04:00
Kyle Fiedler
bbe9432508
Lots of askbot fixes
2012-08-15 13:51:10 -04:00
