To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/lenasys/trunk
Viewing all changes in revision 90.1.10.
- Committer: a11emmjo
- Date: 2013-05-26 14:42:21 UTC
- mto: This revision was merged to the branch mainline in revision 105.
- Revision ID: a11emmjo@student.his.se-20130526144221-6zhtkrqnek1ckyx9
Removed coursemenu and statsmenu and replaced it with new combined sidemenu.
- files added:
- .bzrignore
- 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/application/views/popup
- codeigniter/css
- codeigniter/img
- codeigniter/img/template_layout_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
- courses/DA133G
- css
- etc
- etc/PIE
- js
- js/ace
- media
- media/Widget Library
- media/codeviewer
- media/svgconverter
- php
- files removed:
- trunk
- trunk/Code Tokenizer and Parser
- trunk/Code Viewer Alt
- trunk/Code Viewer Alt/AJAX
- trunk/Code Viewer Alt/Codeviewer
- trunk/CodeViewer
- trunk/CodeViewer/Codeviewer
- trunk/CodeViewer/DomExample1
- trunk/CodeViewer/DomExample2
- trunk/CodeViewer/DomExample3b
- trunk/DuggaSys/changePassword/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_bits_1/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_bits_1/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_colors_1/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_colors_1/css/base.css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_colors_1/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/dugga1_bits_1/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/dugga1_bits_1/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/js
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_2/css
- trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_2/js
- trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_1/css
- trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_1/js
- trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_2/css
- trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_2/js
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/css
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_1/css
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_1/js
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_2/css
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_2/js
- trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/js
- trunk/DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/includes
- trunk/DuggaSys/quizAjax/css
- trunk/DuggaSys/quizAjax/js
- trunk/DuggaSys/quizSystem/css
- trunk/DuggaSys/quizSystem/js
- trunk/ErModeller
- trunk/Widget Library
- files renamed:
- trunk/DuggaSys/ => DuggaSys/
- trunk/DuggaSys/changePassword/pageframe.html.php => DuggaSys/changePassword/pageframe.php
- trunk/DuggaSys/changePassword/password.html.php => DuggaSys/changePassword/password.php
- trunk/DuggaSys/duggor/Dugga Databassystem - ER Modellering Test/canvas_ER_demo.html => DuggaSys/duggor/Dugga Databassystem - ER Modellering Test/canvas_ER_demo.js
- trunk/DuggaSys/quizSystem/course/courses.html.php => DuggaSys/quizSystem/course/courses.php
- trunk/DuggaSys/quizSystem/data/displayData.html.php => DuggaSys/quizSystem/data/displayData.php
- trunk/DuggaSys/quizSystem/login/login.html.php => DuggaSys/quizSystem/login/login.php
- trunk/DuggaSys/quizSystem/pageframe.html.php => DuggaSys/quizSystem/pageframe.php
- trunk/DuggaSys/quizSystem/quiz/addEditQuiz.html.php => DuggaSys/quizSystem/quiz/addEditQuiz.php
- trunk/DuggaSys/quizSystem/quiz/editVariants.html.php => DuggaSys/quizSystem/quiz/editVariants.php
- trunk/DuggaSys/quizSystem/quiz/listDataObjects.html.php => DuggaSys/quizSystem/quiz/listDataObjects.php
- trunk/DuggaSys/quizSystem/quiz/listQuizzes.html.php => DuggaSys/quizSystem/quiz/listQuizzes.php
- trunk/DuggaSys/quizSystem/quizChecking/listQuizAnswers.html.php => DuggaSys/quizSystem/quizChecking/listQuizAnswers.php
- trunk/DuggaSys/quizSystem/quizChecking/quizAnswerDetails.html.php => DuggaSys/quizSystem/quizChecking/quizAnswerDetails.php
- trunk/DuggaSys/quizSystem/quizChecking/selectCourse.html.php => DuggaSys/quizSystem/quizChecking/selectCourse.php
- trunk/DuggaSys/quizSystem/quizChecking/selectQuiz.html.php => DuggaSys/quizSystem/quizChecking/selectQuiz.php
- trunk/DuggaSys/quizSystem/registerStudents/parsingResult.html.php => DuggaSys/quizSystem/registerStudents/parsingResult.php
- trunk/DuggaSys/quizSystem/registerStudents/print.html.php => DuggaSys/quizSystem/registerStudents/print.php
- trunk/DuggaSys/quizSystem/search/search.html.php => DuggaSys/quizSystem/search/search.php
- trunk/DuggaSys/quizSystem/students/listStudents.html.php => DuggaSys/quizSystem/students/listStudents.php
- trunk/ObjConv/ => ObjConv/
- trunk/WebGL and Benchmarking/ => WebGL and Benchmarking/
- trunk/WebGL and Benchmarking/Test1ShaderStartup.html => WebGL and Benchmarking/test1shaderstartup.html
- trunk/WebGL and Benchmarking/httpAjax.js => js/httpAjax.js
- trunk/ErModeller/jquery.js => js/jquery.js
- trunk/WebGL and Benchmarking/webgl-helpers.js => js/webgl-helpers.js
- trunk/Widget Library/sliderline.png => media/Widget Library/sliderline.png
- trunk/Widget Library/sliderring14.png => media/Widget Library/sliderring14.png
- trunk/CodeViewer/Codeviewer/CodeViewerDescareaBack.png => media/codeviewer/CodeViewerDescareaBack.png *
- trunk/CodeViewer/Codeviewer/CodeViewerDownloadbutton.png => media/codeviewer/CodeViewerDownloadbutton.png *
- trunk/CodeViewer/Codeviewer/CodeViewerLeftbutton.png => media/codeviewer/CodeViewerLeftbutton.png *
- trunk/CodeViewer/Codeviewer/CodeViewerLeftbuttonGrayed.png => media/codeviewer/CodeViewerLeftbuttonGrayed.png *
- trunk/CodeViewer/Codeviewer/CodeViewerMenuareaBack.png => media/codeviewer/CodeViewerMenuareaBack.png *
- trunk/CodeViewer/Codeviewer/CodeViewerRightbutton.png => media/codeviewer/CodeViewerRightbutton.png *
- trunk/svg Converter/AmoebaBody.svg => media/svgconverter/AmoebaBody.svg
- trunk/svg Converter/Amoebaface.svg => media/svgconverter/Amoebaface.svg
- trunk/svg Converter/Amoebaface_Eyes.svg => media/svgconverter/Amoebaface_Eyes.svg
- trunk/svg Converter/CubeIsometric.svg => media/svgconverter/CubeIsometric.svg
- trunk/svg Converter/CubeTwoDee.svg => media/svgconverter/CubeTwoDee.svg
- trunk/svg Converter/Map_Cloud.svg => media/svgconverter/Map_Cloud.svg
- trunk/svg Converter/Map_Sun.svg => media/svgconverter/Map_Sun.svg
- trunk/svg Converter/Map_Sweden.svg => media/svgconverter/Map_Sweden.svg
- trunk/svg Converter/Seat_With_Armrest.svg => media/svgconverter/Seat_With_Armrest.svg
- trunk/svg Converter/TestHole.svg => media/svgconverter/TestHole.svg
- trunk/svg Converter/TestHoleII.svg => media/svgconverter/TestHoleII.svg
- trunk/svg Converter/Washer_Dryer.svg => media/svgconverter/Washer_Dryer.svg
- trunk/svg Converter/Washer_Dryer_Isometric.svg => media/svgconverter/Washer_Dryer_Isometric.svg
- trunk/svg Converter/Washer_Washer.svg => media/svgconverter/Washer_Washer.svg
- trunk/svg Converter/Washer_Washer_Isometric.svg => media/svgconverter/Washer_Washer_Isometric.svg
- trunk/svg Converter/ => svg Converter/
- trunk/svg Converter/SVG_httpAjax.js => svg Converter/svgconverter.js *
- trunk/svg Converter/index.php => svg Converter/svgconverter.php
- trunk/svg Converter/SVG_TO_CANVAS_III.php => svg Converter/svgtocanvas.php
- files modified:
- DuggaSys/changePassword/index.php
expand all
collapse all
added
removed
codeigniter/img/LSlogo.png
codeigniter/img/background_tile_1.jpg
codeigniter/img/background_tile_2.jpg
codeigniter/img/background_tile_3.jpg
codeigniter/img/bannermenu_bg.png
codeigniter/img/biglogo.png
codeigniter/img/blue_line.jpg
codeigniter/img/borderbackground.png
codeigniter/img/done.png
codeigniter/img/example_indicator.png
codeigniter/img/expandIcon.png
codeigniter/img/glyphicons-halflings-white.png
codeigniter/img/glyphicons-halflings.png
codeigniter/img/icomoon_arrow_down.png
codeigniter/img/icomoon_checkmark.png
codeigniter/img/logo.png
codeigniter/img/logo_button.png
codeigniter/img/minus_button.png
codeigniter/img/movearrow_down_button.png
codeigniter/img/movearrow_up_button.png
codeigniter/img/noborder_pencil_edit_button.png
codeigniter/img/pencil_edit_button.png
codeigniter/img/plusbutton.png
codeigniter/img/quizz_indicator.png
codeigniter/img/small_minus_button.png
codeigniter/img/template_layout_img/0.png
codeigniter/img/template_layout_img/1.png
codeigniter/img/template_layout_img/10.png
codeigniter/img/template_layout_img/11.png
codeigniter/img/template_layout_img/12.png
codeigniter/img/template_layout_img/13.png
codeigniter/img/template_layout_img/14.png
codeigniter/img/template_layout_img/15.png
codeigniter/img/template_layout_img/16.png
codeigniter/img/template_layout_img/2.png
codeigniter/img/template_layout_img/3.png
codeigniter/img/template_layout_img/4.png
codeigniter/img/template_layout_img/5.png
codeigniter/img/template_layout_img/6.png
codeigniter/img/template_layout_img/7.png
codeigniter/img/template_layout_img/8.png
codeigniter/img/template_layout_img/9.png
codeigniter/img/user_menu_button.png
codeigniter/img/visibility_hidden_button.png
codeigniter/img/visibility_shown_button.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
media/Logo-preliminary.png
trunk/Code Viewer Alt/AJAX/ArrowBack.png
trunk/CodeViewer/DomExample1/DomExample1.png
trunk/CodeViewer/DomExample2/DomExample2.png
trunk/CodeViewer/DomExample3b/DomExample3b.png
