← Back to branch summary

~azzar1/unity/add-show-desktop-key

~azzar1/unity/add-show-desktop-key

Viewing all changes in revision 1099.1.220.

Committer: Nick Chadwick
Date: 2009-02-26 01:22:17 UTC
mfrom: (1122 trunk)
mto: (1099.1.227 exercise-ui)
mto: This revision was merged to the branch mainline in revision 1162.
Revision ID: chadnickbok@gmail.com-20090226012217-33qu812g6cm3my2n

Merged from trunk

files added:
bin/ivle-cloneworksheets

image-source

image-source/h1-bg.svg

image-source/split-tab.sh

image-source/tab.svg

image-source/title.svg

image-source/topbar-slashes.svg

ivle/webapp/coremedia/images/chrome

ivle/webapp/coremedia/images/chrome/h1-bg.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/worksheet

ivle/worksheet/__init__.py

userdb/migrations/20090224-01.sql

userdb/migrations/20090225-01.sql

files removed:
ivle/caps.py

files renamed:
ivle/webapp/tutorial/definitions.txt => ivle/worksheet/definitions.txt

ivle/webapp/tutorial/rst.py => ivle/worksheet/rst.py

ivle/worksheet.py => ivle/worksheet/utils.py

files modified:
bin/ivle-enrol

bin/ivle-makeuser

bin/ivle-marks

ivle/auth/guest_auth.py

ivle/database.py

ivle/dispatch/__init__.py

ivle/makeuser.py

ivle/pulldown_subj/__init__.py

ivle/rpc/decorators.py

ivle/util.py

ivle/webapp/admin/subject-media/subjects-small.png

ivle/webapp/admin/subject-media/subjects.png

ivle/webapp/admin/subject.py

ivle/webapp/admin/subjects.html

ivle/webapp/admin/user-media/settings.js

ivle/webapp/admin/user-settings.html

ivle/webapp/admin/user.py

ivle/webapp/base/ivle-headings.html

ivle/webapp/base/xhtml.py

ivle/webapp/base/xhtmlerror.html

ivle/webapp/base/xhtmlunauthorized.html

ivle/webapp/console/__init__.py

ivle/webapp/console/media/console.css

ivle/webapp/console/media/console.js

ivle/webapp/console/overlay.html

ivle/webapp/coremedia/ivle.css

ivle/webapp/filesystem/browser/__init__.py

ivle/webapp/filesystem/browser/media/browser.css

ivle/webapp/filesystem/browser/template.html

ivle/webapp/filesystem/diff/template.html

ivle/webapp/forum/__init__.py

ivle/webapp/groups/__init__.py

ivle/webapp/groups/template.html

ivle/webapp/help/__init__.py

ivle/webapp/help/helpview.html

ivle/webapp/help/toc.html

ivle/webapp/security/logout.html

ivle/webapp/tos/accept.html

ivle/webapp/tos/media/tos.js

ivle/webapp/tos/view.html

ivle/webapp/tutorial/__init__.py

ivle/webapp/tutorial/exercise_service.py

ivle/webapp/tutorial/media/tutorial.css

ivle/webapp/tutorial/service.py

ivle/webapp/tutorial/templates/subjectmenu.html

ivle/webapp/tutorial/templates/worksheet.html

ivle/webapp/tutorial/templates/worksheet_add.html

ivle/webapp/tutorial/templates/worksheet_edit.html

ivle/webapp/tutorial/templates/worksheets_edit.html

ivle/webapp/userservice/__init__.py

services/fileservice *

services/python-console *

services/serveservice *

services/usrmgt-server *

setup/util.py

userdb/users.sql

Show diffs side-by-side

added added

removed removed

bin/ivle-cloneworksheets

bin/ivle-makeuser

image-source/h1-bg.svg

image-source/split-tab.sh

image-source/tab.svg

image-source/title.svg

ivle/auth/guest_auth.py

ivle/database.py

ivle/dispatch/__init__.py

ivle/makeuser.py

ivle/pulldown_subj/__init__.py

ivle/rpc/decorators.py

ivle/webapp/admin/subject-media/subjects-small.png

ivle/webapp/admin/subject-media/subjects.png

ivle/webapp/admin/subject.py

ivle/webapp/admin/subjects.html

ivle/webapp/admin/user-media/settings.js

ivle/webapp/admin/user-settings.html

ivle/webapp/admin/user.py

ivle/webapp/base/ivle-headings.html

ivle/webapp/base/xhtml.py

ivle/webapp/base/xhtmlerror.html

ivle/webapp/base/xhtmlunauthorized.html

ivle/webapp/console/__init__.py

ivle/webapp/console/media/console.css

ivle/webapp/console/media/console.js

ivle/webapp/console/overlay.html

ivle/webapp/coremedia/images/chrome/

ivle/webapp/coremedia/images/chrome/h1-bg.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/ivle.css

ivle/webapp/filesystem/browser/__init__.py

ivle/webapp/filesystem/browser/media/browser.css

ivle/webapp/filesystem/browser/template.html

ivle/webapp/filesystem/diff/template.html

ivle/webapp/forum/__init__.py

ivle/webapp/groups/__init__.py

ivle/webapp/groups/template.html

ivle/webapp/help/__init__.py

ivle/webapp/help/helpview.html

ivle/webapp/help/toc.html

ivle/webapp/security/logout.html

ivle/webapp/tos/accept.html

ivle/webapp/tos/media/tos.js

ivle/webapp/tos/view.html

ivle/webapp/tutorial/__init__.py

ivle/webapp/tutorial/exercise_service.py

ivle/webapp/tutorial/media/tutorial.css

ivle/webapp/tutorial/service.py

ivle/webapp/tutorial/templates/subjectmenu.html

ivle/webapp/tutorial/templates/worksheet.html

ivle/webapp/tutorial/templates/worksheet_add.html

ivle/webapp/tutorial/templates/worksheet_edit.html

ivle/webapp/tutorial/templates/worksheets_edit.html

ivle/webapp/userservice/__init__.py

ivle/worksheet/

ivle/worksheet/__init__.py

ivle/worksheet/utils.py

userdb/migrations/20090224-01.sql

userdb/migrations/20090225-01.sql

userdb/users.sql

Older »