Viewing all changes in revision 1294.2.120.
- Committer: William Grant
- Date: 2009-08-03 02:05:34 UTC
- mfrom: (1302 trunk)
- mto: (1294.4.11 ui-the-third)
- mto: This revision was merged to the branch mainline in revision 1353.
- Revision ID: grantw@unimelb.edu.au-20090803020534-v4o981611g4dimgw
Merge from trunk.
- files added:
- .bzrignore
- bin
- bin/timount
- bin/trampoline
- doc/setup
- doc/tutorial
- exercises
- exercises/sample
- image-source
- ivle
- ivle/auth
- ivle/conf
- ivle/conf/app
- ivle/config
- ivle/dispatch
- ivle/fileservice_lib
- ivle/jailbuilder
- ivle/pulldown_subj
- ivle/rpc
- ivle/webapp
- ivle/webapp/admin
- ivle/webapp/admin/subject-media
- ivle/webapp/admin/templates
- ivle/webapp/admin/user-media
- ivle/webapp/base
- ivle/webapp/base/test
- ivle/webapp/console
- ivle/webapp/console/media
- ivle/webapp/coremedia
- ivle/webapp/coremedia/images
- ivle/webapp/coremedia/images/apps
- ivle/webapp/coremedia/images/apps/small
- ivle/webapp/coremedia/images/chrome
- ivle/webapp/coremedia/images/interface
- ivle/webapp/coremedia/images/mime
- ivle/webapp/coremedia/images/mime/large
- ivle/webapp/coremedia/images/svn
- ivle/webapp/fileservice
- ivle/webapp/filesystem
- ivle/webapp/filesystem/browser/media/codepress
- ivle/webapp/filesystem/browser/media/codepress/engines
- ivle/webapp/filesystem/browser/media/codepress/images
- ivle/webapp/filesystem/browser/media/codepress/languages
- ivle/webapp/filesystem/diff
- ivle/webapp/filesystem/diff/media
- ivle/webapp/filesystem/svnlog
- ivle/webapp/filesystem/svnlog/media
- ivle/webapp/forum
- ivle/webapp/forum/media
- ivle/webapp/groups
- ivle/webapp/groups/media
- ivle/webapp/help
- ivle/webapp/help/media
- ivle/webapp/publisher
- ivle/webapp/security
- ivle/webapp/submit
- ivle/webapp/testing
- ivle/webapp/tos
- ivle/webapp/tos/media
- ivle/webapp/tutorial
- ivle/webapp/tutorial/media
- ivle/webapp/tutorial/media/images
- ivle/webapp/tutorial/media/images/tiny
- ivle/webapp/tutorial/templates
- ivle/webapp/tutorial/test
- ivle/webapp/userservice
- ivle/worksheet
- services
- setup
- subjects
- subjects/sample
- test
- test/misc
- test/test_framework
- userdb/migrations
- files removed:
- LICENSE.txt
- console
- platform
- platform/config
- platform/scripts
- prototypes
- prototypes/browser
- prototypes/browser/browser-interface
- prototypes/browser/browser-interface/images
- prototypes/browser/browser-interface/images/interface
- prototypes/browser/browser-interface/images/mime
- prototypes/browser/browser-interface/images/mime/large
- prototypes/browser/browser-interface/images/svn
- trampoline
- www
- www/apps
- www/apps/debuginfo
- www/apps/download
- www/apps/dummy
- www/apps/fileservice
- www/apps/help
- www/auth
- www/common
- www/conf
- www/conf/app
- www/dispatch
- www/media
- www/media/common
- www/media/images
- www/media/images/mime
- files renamed:
- www/media/common/ivle.css => ivle/webapp/coremedia/ivle.css
- www/media/common/json2.js => ivle/webapp/coremedia/json2.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/apps/server/ => ivle/webapp/filesystem/serve/
- files modified:
- doc/dependencies.txt
expand all
collapse all
added
removed
image-source/breadcrumb-chevron.svg
image-source/drop-down.svg
image-source/h1-bg.svg
image-source/root-breadcrumb.svg
image-source/tab.svg
image-source/title.svg
image-source/topbar-slashes.svg
ivle/webapp/admin/subject-media/subjects-small.png
ivle/webapp/admin/subject-media/subjects.png
ivle/webapp/console/media/console-small.png
ivle/webapp/console/media/console.png
ivle/webapp/coremedia/images/apps/editor.png
ivle/webapp/coremedia/images/apps/groups.png
ivle/webapp/coremedia/images/apps/home.png
ivle/webapp/coremedia/images/apps/settings.png
ivle/webapp/coremedia/images/apps/small/editor.png
ivle/webapp/coremedia/images/apps/small/groups.png
ivle/webapp/coremedia/images/apps/small/home.png
ivle/webapp/coremedia/images/apps/small/settings.png
ivle/webapp/coremedia/images/chrome/breadcrumb-chevron.png
ivle/webapp/coremedia/images/chrome/drop-down.png
ivle/webapp/coremedia/images/chrome/h1-bg.png
ivle/webapp/coremedia/images/chrome/root-breadcrumb.png
ivle/webapp/coremedia/images/chrome/tab-hover-left.png
ivle/webapp/coremedia/images/chrome/tab-hover-mid.png
ivle/webapp/coremedia/images/chrome/tab-hover-right.png
ivle/webapp/coremedia/images/chrome/tab-left.png
ivle/webapp/coremedia/images/chrome/tab-mid.png
ivle/webapp/coremedia/images/chrome/tab-right.png
ivle/webapp/coremedia/images/chrome/tab-selected-left.png
ivle/webapp/coremedia/images/chrome/tab-selected-mid.png
ivle/webapp/coremedia/images/chrome/tab-selected-right.png
ivle/webapp/coremedia/images/chrome/title.png
ivle/webapp/coremedia/images/chrome/topbar-slashes.png
ivle/webapp/coremedia/images/interface/cross.png
ivle/webapp/coremedia/images/interface/loading.gif
ivle/webapp/coremedia/images/interface/maximize.png
ivle/webapp/coremedia/images/interface/minimize.png
ivle/webapp/coremedia/images/interface/published.png
ivle/webapp/coremedia/images/interface/sortdown.png
ivle/webapp/coremedia/images/interface/sortup.png
ivle/webapp/coremedia/images/mime/dir.png
ivle/webapp/coremedia/images/mime/large/dir.png
ivle/webapp/coremedia/images/mime/large/multi.png
ivle/webapp/coremedia/images/mime/large/py.png
ivle/webapp/coremedia/images/mime/large/txt.png
ivle/webapp/coremedia/images/mime/py.png
ivle/webapp/coremedia/images/mime/txt.png
ivle/webapp/coremedia/images/svn/added.png
ivle/webapp/coremedia/images/svn/conflicted.png
ivle/webapp/coremedia/images/svn/deleted.png
ivle/webapp/coremedia/images/svn/missing.png
ivle/webapp/coremedia/images/svn/modified.png
ivle/webapp/coremedia/images/svn/normal.png
ivle/webapp/coremedia/images/svn/revision.png
ivle/webapp/filesystem/browser/media/browser-small.png
ivle/webapp/filesystem/browser/media/browser.png
ivle/webapp/filesystem/browser/media/codepress/images/line-numbers.png
ivle/webapp/forum/media/forum-small.png
ivle/webapp/forum/media/forum.png
ivle/webapp/groups/media/cross.png
ivle/webapp/help/media/help-small.png
ivle/webapp/help/media/help.png
ivle/webapp/tutorial/media/images/check.png
ivle/webapp/tutorial/media/images/cross.png
ivle/webapp/tutorial/media/images/down.png
ivle/webapp/tutorial/media/images/exception.png
ivle/webapp/tutorial/media/images/fail.png
ivle/webapp/tutorial/media/images/incomplete.png
ivle/webapp/tutorial/media/images/pass.png
ivle/webapp/tutorial/media/images/pencil.png
ivle/webapp/tutorial/media/images/semifail.png
ivle/webapp/tutorial/media/images/signature.png
ivle/webapp/tutorial/media/images/tiny/complete.png
ivle/webapp/tutorial/media/images/tiny/incomplete.png
ivle/webapp/tutorial/media/images/tiny/semicomplete.png
ivle/webapp/tutorial/media/images/up.png
ivle/webapp/tutorial/media/tutorial-small.png
ivle/webapp/tutorial/media/tutorial.png
prototypes/browser/browser-interface/images/interface/sortdown.png
prototypes/browser/browser-interface/images/interface/sortup.png
prototypes/browser/browser-interface/images/mime/dir.png
prototypes/browser/browser-interface/images/mime/large/dir.png
prototypes/browser/browser-interface/images/mime/large/multi.png
prototypes/browser/browser-interface/images/mime/large/py.png
prototypes/browser/browser-interface/images/mime/large/txt.png
prototypes/browser/browser-interface/images/mime/py.png
prototypes/browser/browser-interface/images/mime/txt.png
prototypes/browser/browser-interface/images/svn/modified.png
prototypes/browser/browser-interface/images/svn/normal.png
prototypes/browser/browser-interface/images/svn/unversioned.png
userdb/users.png
www/media/images/mime/dir.png
