Viewing all changes in revision 1092.1.27.
- Committer: William Grant
- Date: 2009-02-16 04:51:05 UTC
- mfrom: (1099.1.128 new-dispatch)
- mto: (1092.1.63 setup-stuff) (1099.1.151 new-dispatch)
- mto: This revision was merged to the branch mainline in revision 1100.
- Revision ID: grantw@unimelb.edu.au-20090216045105-sc5hg5ol8qydwisr
Merge from new-dispatch.
- files added:
- .bzrignore
- etc
- ivle/config
- ivle/jailbuilder
- ivle/rpc
- ivle/webapp
- ivle/webapp/admin
- ivle/webapp/admin/subject-media
- ivle/webapp/admin/user-media
- ivle/webapp/base
- ivle/webapp/base/test
- ivle/webapp/console
- ivle/webapp/coremedia
- ivle/webapp/coremedia/images
- ivle/webapp/filesystem
- ivle/webapp/help
- ivle/webapp/security
- ivle/webapp/testing
- files removed:
- ivle/db.py
- www/apps/console
- www/apps/consoleservice
- www/apps/dummy
- www/apps/help
- www/apps/home
- www/apps/logout
- www/apps/settings
- www/apps/subjects
- www/apps/tutorialservice
- www/media
- www/media/common
- www/media/images
- www/media/settings
- www/media/subjects
- www/media/subjects/sample
- www/plugins
- www/plugins/console
- files renamed:
- www/media/images/apps/small/subjects.png => ivle/webapp/admin/subject-media/subjects-small.png
- www/media/images/apps/subjects.png => ivle/webapp/admin/subject-media/subjects.png
- www/apps/subjects/__init__.py => ivle/webapp/admin/subject.py
- www/media/settings/settings.js => ivle/webapp/admin/user-media/settings.js
- www/apps/settings/help.html => ivle/webapp/admin/user-settings-help.html
- www/apps/console/help.html => ivle/webapp/console/help.html
- www/media/console/ => ivle/webapp/console/media/
- www/media/images/apps/small/console.png => ivle/webapp/console/media/console-small.png
- www/media/images/apps/console.png => ivle/webapp/console/media/console.png
- www/apps/consoleservice/__init__.py => ivle/webapp/console/service.py
- www/media/images/README => ivle/webapp/coremedia/images/README
- www/media/images/apps/ => ivle/webapp/coremedia/images/apps/
- www/media/images/interface/ => ivle/webapp/coremedia/images/interface/
- www/media/images/mime/ => ivle/webapp/coremedia/images/mime/
- www/media/images/svn/ => ivle/webapp/coremedia/images/svn/
- www/media/common/ivle.css => ivle/webapp/coremedia/ivle.css
- www/media/common/json2.js => ivle/webapp/coremedia/json2.js
- www/media/common/md5.js => ivle/webapp/coremedia/md5.js
- www/media/common/tos.js => ivle/webapp/coremedia/tos.js
- www/media/common/util.js => ivle/webapp/coremedia/util.js
- www/apps/browser/ => ivle/webapp/filesystem/browser/
- www/media/browser/ => ivle/webapp/filesystem/browser/media/
- www/media/images/apps/small/browser.png => ivle/webapp/filesystem/browser/media/browser-small.png
- www/media/common/codepress/ => ivle/webapp/filesystem/browser/media/codepress/
- www/apps/diff/ => ivle/webapp/filesystem/diff/
- www/media/diff/ => ivle/webapp/filesystem/diff/media/
- www/apps/svnlog/ => ivle/webapp/filesystem/svnlog/
- www/media/svn/ => ivle/webapp/filesystem/svnlog/media/
- www/apps/forum/ => ivle/webapp/forum/
- www/media/forum/ => ivle/webapp/forum/media/
- www/media/images/apps/small/forum.png => ivle/webapp/forum/media/forum-small.png
- www/media/images/apps/forum.png => ivle/webapp/forum/media/forum.png
- www/apps/groups/ => ivle/webapp/groups/
- www/media/groups/ => ivle/webapp/groups/media/
- www/media/help/ => ivle/webapp/help/media/
- www/media/images/apps/small/help.png => ivle/webapp/help/media/help-small.png
- www/media/images/apps/help.png => ivle/webapp/help/media/help.png
- www/apps/logout/__init__.py => ivle/webapp/security/views.py
- www/apps/tos/ => ivle/webapp/tos/
- www/apps/tutorial/ => ivle/webapp/tutorial/
- www/media/tutorial/ => ivle/webapp/tutorial/media/
- www/media/images/tutorial/ => ivle/webapp/tutorial/media/images/
- www/media/images/apps/small/tutorial.png => ivle/webapp/tutorial/media/tutorial-small.png
- www/media/images/apps/tutorial.png => ivle/webapp/tutorial/media/tutorial.png
- www/apps/tutorialservice/__init__.py => ivle/webapp/tutorial/service.py
- www/apps/tutorialservice/test/ => ivle/webapp/tutorial/test/
- files modified:
- bin/ivle-enrol
expand all
collapse all
added
removed
ivle/webapp/filesystem/browser/media/browser.png
www/media/images/apps/browser.png
