Bridger Maxwell
|
d31f0c9f06
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
requirements.txt
|
2012-08-20 16:10:17 -04:00 |
|
Bridger Maxwell
|
9bc5aec01a
|
Fixed up courseware-error view. Moved it to templates/courseware too.
|
2012-08-20 15:03:55 -04:00 |
|
Bridger Maxwell
|
adbe71b5df
|
Got simplewiki just cleaned up enough to work again, so I could view a page for reference.
|
2012-08-19 19:57:19 -04:00 |
|
Kyle Fiedler
|
731f1cd7a8
|
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
|
2012-08-13 15:05:43 -04:00 |
|
Kyle Fiedler
|
dd6ec19e80
|
Make the modal window work in the courseware
|
2012-08-07 11:59:49 -04:00 |
|
Kyle Fiedler
|
ac960ab9df
|
Add images for book and fix styles for wiki
|
2012-08-06 16:08:40 -04:00 |
|
Kyle Fiedler
|
7ab5bbfaef
|
Moved files and removed files
|
2012-07-30 17:37:53 -04:00 |
|
Kyle Fiedler
|
18dc689d4d
|
Added fix for where the course.css is being brought in
|
2012-07-25 14:57:44 -04:00 |
|
Calen Pennington
|
d2d29b2cf9
|
Move most javascript loading to below the body, rather than head
|
2012-07-23 11:27:22 -04:00 |
|
Bridger Maxwell
|
9ebac1bdd7
|
Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware.
|
2012-07-23 08:18:37 -04:00 |
|
Bridger Maxwell
|
4d349fbd9d
|
Fixed wiki error page again.
|
2012-07-06 17:42:01 -04:00 |
|
Bridger Maxwell
|
6d7b477982
|
Fixed wiki revision feed.
|
2012-07-06 12:55:05 -04:00 |
|
Bridger Maxwell
|
ac0a776818
|
First pass at getting both independent and in-course wiki viewing.
|
2012-07-05 21:20:35 -04:00 |
|
Bridger Maxwell
|
072de594ff
|
Fixed wiki error pages a bit.
|
2012-07-05 08:14:41 -07:00 |
|
Bridger Maxwell
|
064274a756
|
Most of the wiki pages are now loading without errors.
|
2012-07-03 09:50:58 -07:00 |
|
Bridger Maxwell
|
baa2c06803
|
Got history and view revision working on wiki.
|
2012-06-29 20:53:36 -04:00 |
|
Bridger Maxwell
|
b69deb698d
|
Got the view page of the wiki rendering. Most of it is a styling mess.
|
2012-06-29 12:05:55 -04:00 |
|
Bridger Maxwell
|
2a9a15ad66
|
Beginning to port wiki to multicourse. (Unstable)
|
2012-06-28 15:11:00 -04:00 |
|