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

..

simplewiki_base.html

Fixed up courseware-error view. Moved it to templates/courseware too.

2012-08-20 15:03:55 -04:00

simplewiki_edit.html

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

simplewiki_error.html

Fixed wiki error page again.

2012-07-06 17:42:01 -04:00

simplewiki_history.html

First pass at getting both independent and in-course wiki viewing.

2012-07-05 21:20:35 -04:00

simplewiki_instructions.html

Beginning to port wiki to multicourse. (Unstable)

2012-06-28 15:11:00 -04:00

simplewiki_revision_feed.html

Fixed wiki revision feed.

2012-07-06 12:55:05 -04:00

simplewiki_searchresults.html

Make the modal window work in the courseware

2012-08-07 11:59:49 -04:00

simplewiki_updateprogressbar.html

Beginning to port wiki to multicourse. (Unstable)

2012-06-28 15:11:00 -04:00

simplewiki_view.html

Beginning to port wiki to multicourse. (Unstable)

2012-06-28 15:11:00 -04:00