To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/lenasys/trunk
Viewing all changes in revision 16.
- Committer: Gustav Hartvigsson
- Date: 2013-04-04 17:50:47 UTC
- mfrom: (11.2.3 teamBranch)
- Revision ID: gustav.hartvigsson@gmail.com-20130404175047-rfrknwjirjq330tg
Merged implementation group 2's team branch into trunk, at end-of-day 20130404.
- files added:
- Code Viewer Alt/.DS_Store
- files removed:
- COPYING
- codeigniter
- codeigniter/application
- codeigniter/application/cache
- codeigniter/application/config
- codeigniter/application/controllers
- codeigniter/application/core
- codeigniter/application/errors
- codeigniter/application/helpers
- codeigniter/application/hooks
- codeigniter/application/language
- codeigniter/application/language/english
- codeigniter/application/libraries
- codeigniter/application/logs
- codeigniter/application/models
- codeigniter/application/models/admin
- codeigniter/application/models/codeviewer
- codeigniter/application/third_party
- codeigniter/application/views
- codeigniter/application/views/admin
- codeigniter/application/views/codeviewer
- codeigniter/css
- codeigniter/img
- codeigniter/js
- codeigniter/js/ace
- codeigniter/js/ckeditor
- codeigniter/js/ckeditor/lang
- codeigniter/js/ckeditor/plugins
- codeigniter/js/ckeditor/plugins/a11yhelp
- codeigniter/js/ckeditor/plugins/a11yhelp/dialogs
- codeigniter/js/ckeditor/plugins/a11yhelp/dialogs/lang
- codeigniter/js/ckeditor/plugins/about
- codeigniter/js/ckeditor/plugins/about/dialogs
- codeigniter/js/ckeditor/plugins/clipboard
- codeigniter/js/ckeditor/plugins/clipboard/dialogs
- codeigniter/js/ckeditor/plugins/dialog
- codeigniter/js/ckeditor/plugins/fakeobjects
- codeigniter/js/ckeditor/plugins/fakeobjects/images
- codeigniter/js/ckeditor/plugins/image
- codeigniter/js/ckeditor/plugins/image/dialogs
- codeigniter/js/ckeditor/plugins/image/images
- codeigniter/js/ckeditor/plugins/link
- codeigniter/js/ckeditor/plugins/link/dialogs
- codeigniter/js/ckeditor/plugins/link/images
- codeigniter/js/ckeditor/plugins/magicline
- codeigniter/js/ckeditor/plugins/magicline/images
- codeigniter/js/ckeditor/plugins/pastefromword
- codeigniter/js/ckeditor/plugins/pastefromword/filter
- codeigniter/js/ckeditor/plugins/scayt
- codeigniter/js/ckeditor/plugins/scayt/dialogs
- codeigniter/js/ckeditor/plugins/specialchar
- codeigniter/js/ckeditor/plugins/specialchar/dialogs
- codeigniter/js/ckeditor/plugins/specialchar/dialogs/lang
- codeigniter/js/ckeditor/plugins/table
- codeigniter/js/ckeditor/plugins/table/dialogs
- codeigniter/js/ckeditor/plugins/tabletools
- codeigniter/js/ckeditor/plugins/tabletools/dialogs
- codeigniter/js/ckeditor/plugins/wsc
- codeigniter/js/ckeditor/plugins/wsc/dialogs
- codeigniter/js/ckeditor/skins
- codeigniter/js/ckeditor/skins/moonocolor
- codeigniter/js/ckeditor/skins/moonocolor/images
- codeigniter/system
- codeigniter/system/core
- codeigniter/system/database
- codeigniter/system/database/drivers
- codeigniter/system/database/drivers/cubrid
- codeigniter/system/database/drivers/mssql
- codeigniter/system/database/drivers/mysql
- codeigniter/system/database/drivers/mysqli
- codeigniter/system/database/drivers/oci8
- codeigniter/system/database/drivers/odbc
- codeigniter/system/database/drivers/pdo
- codeigniter/system/database/drivers/postgre
- codeigniter/system/database/drivers/sqlite
- codeigniter/system/database/drivers/sqlsrv
- codeigniter/system/fonts
- codeigniter/system/helpers
- codeigniter/system/language
- codeigniter/system/language/english
- codeigniter/system/libraries
- codeigniter/system/libraries/Cache
- codeigniter/system/libraries/Cache/drivers
- codeigniter/system/libraries/javascript
- courses
- etc/PIE
- js/ace
- files renamed:
- DuggaSys/changePassword/pageframe.php => DuggaSys/changePassword/pageframe.html.php
- DuggaSys/changePassword/password.php => DuggaSys/changePassword/password.html.php
- DuggaSys/quizSystem/course/courses.php => DuggaSys/quizSystem/course/courses.html.php
- DuggaSys/quizSystem/data/displayData.php => DuggaSys/quizSystem/data/displayData.html.php
- DuggaSys/quizSystem/login/login.php => DuggaSys/quizSystem/login/login.html.php
- DuggaSys/quizSystem/pageframe.php => DuggaSys/quizSystem/pageframe.html.php
- DuggaSys/quizSystem/quiz/addEditQuiz.php => DuggaSys/quizSystem/quiz/addEditQuiz.html.php
- DuggaSys/quizSystem/quiz/editVariants.php => DuggaSys/quizSystem/quiz/editVariants.html.php
- DuggaSys/quizSystem/quiz/listDataObjects.php => DuggaSys/quizSystem/quiz/listDataObjects.html.php
- DuggaSys/quizSystem/quiz/listQuizzes.php => DuggaSys/quizSystem/quiz/listQuizzes.html.php
- DuggaSys/quizSystem/quizChecking/listQuizAnswers.php => DuggaSys/quizSystem/quizChecking/listQuizAnswers.html.php
- DuggaSys/quizSystem/quizChecking/quizAnswerDetails.php => DuggaSys/quizSystem/quizChecking/quizAnswerDetails.html.php
- DuggaSys/quizSystem/quizChecking/selectCourse.php => DuggaSys/quizSystem/quizChecking/selectCourse.html.php
- DuggaSys/quizSystem/quizChecking/selectQuiz.php => DuggaSys/quizSystem/quizChecking/selectQuiz.html.php
- DuggaSys/quizSystem/registerStudents/parsingResult.php => DuggaSys/quizSystem/registerStudents/parsingResult.html.php
- DuggaSys/quizSystem/registerStudents/print.php => DuggaSys/quizSystem/registerStudents/print.html.php
- DuggaSys/quizSystem/search/search.php => DuggaSys/quizSystem/search/search.html.php
- DuggaSys/quizSystem/students/listStudents.php => DuggaSys/quizSystem/students/listStudents.html.php
- js/httpAjax.js => WebGL and Benchmarking/httpAjax.js
- js/webgl-helpers.js => WebGL and Benchmarking/webgl-helpers.js
- files modified:
- Code Tokenizer and Parser/Parser_Test.css
expand all
collapse all
added
removed
codeigniter/img/background_tile_1.jpg
codeigniter/img/background_tile_2.jpg
codeigniter/img/background_tile_3.jpg
codeigniter/img/blue_line.jpg
codeigniter/img/done.png
codeigniter/img/glyphicons-halflings-white.png
codeigniter/img/glyphicons-halflings.png
codeigniter/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
codeigniter/js/ckeditor/plugins/fakeobjects/images/spacer.gif
codeigniter/js/ckeditor/plugins/icons.png
codeigniter/js/ckeditor/plugins/image/images/noimage.png
codeigniter/js/ckeditor/plugins/link/images/anchor.png
codeigniter/js/ckeditor/plugins/magicline/images/icon.png
codeigniter/js/ckeditor/skins/moonocolor/icons.png
codeigniter/js/ckeditor/skins/moonocolor/images/arrow.png
codeigniter/js/ckeditor/skins/moonocolor/images/close.png
codeigniter/js/ckeditor/skins/moonocolor/images/mini.png
