Merging from commit 9177

16 years ago · 6e56cf4298
parent 93a6b61e33 0bc86b8489
commit 6e56cf4298
6013 changed files with 1 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
--- a/README.txt
+++ b/README.txt
--- a/archive/index.html
+++ b/archive/index.html
--- a/courses/index.html
+++ b/courses/index.html
--- a/favicon.ico
+++ b/favicon.ico
--- a/home/default_platform_document/index.html
+++ b/home/default_platform_document/index.html
--- a/home/default_platform_document/template_thumb/audiocomment.gif
+++ b/home/default_platform_document/template_thumb/audiocomment.gif
--- a/home/default_platform_document/template_thumb/checklist.gif
+++ b/home/default_platform_document/template_thumb/checklist.gif
--- a/home/default_platform_document/template_thumb/compare.gif
+++ b/home/default_platform_document/template_thumb/compare.gif
--- a/home/default_platform_document/template_thumb/courseobjectives.gif
+++ b/home/default_platform_document/template_thumb/courseobjectives.gif
--- a/home/default_platform_document/template_thumb/coursetitle.gif
+++ b/home/default_platform_document/template_thumb/coursetitle.gif
--- a/home/default_platform_document/template_thumb/cyclechart.gif
+++ b/home/default_platform_document/template_thumb/cyclechart.gif
--- a/home/default_platform_document/template_thumb/description.gif
+++ b/home/default_platform_document/template_thumb/description.gif
--- a/home/default_platform_document/template_thumb/diagram.gif
+++ b/home/default_platform_document/template_thumb/diagram.gif
--- a/home/default_platform_document/template_thumb/empty.gif
+++ b/home/default_platform_document/template_thumb/empty.gif
--- a/home/default_platform_document/template_thumb/flash.gif
+++ b/home/default_platform_document/template_thumb/flash.gif
--- a/home/default_platform_document/template_thumb/index.html
+++ b/home/default_platform_document/template_thumb/index.html
--- a/home/default_platform_document/template_thumb/learnerwonder.gif
+++ b/home/default_platform_document/template_thumb/learnerwonder.gif
--- a/home/default_platform_document/template_thumb/leftlist.gif
+++ b/home/default_platform_document/template_thumb/leftlist.gif
--- a/home/default_platform_document/template_thumb/leftrightlist.gif
+++ b/home/default_platform_document/template_thumb/leftrightlist.gif
--- a/home/default_platform_document/template_thumb/noimage.gif
+++ b/home/default_platform_document/template_thumb/noimage.gif
--- a/home/default_platform_document/template_thumb/phasetimeline.gif
+++ b/home/default_platform_document/template_thumb/phasetimeline.gif
--- a/home/default_platform_document/template_thumb/rightlist.gif
+++ b/home/default_platform_document/template_thumb/rightlist.gif
--- a/home/default_platform_document/template_thumb/stopthink.gif
+++ b/home/default_platform_document/template_thumb/stopthink.gif
--- a/home/default_platform_document/template_thumb/table.gif
+++ b/home/default_platform_document/template_thumb/table.gif
--- a/home/default_platform_document/template_thumb/video.gif
+++ b/home/default_platform_document/template_thumb/video.gif
--- a/home/default_platform_document/template_thumb/yourinstructor.gif
+++ b/home/default_platform_document/template_thumb/yourinstructor.gif
--- a/home/faq.html
+++ b/home/faq.html
--- a/home/home_menu.html
+++ b/home/home_menu.html
--- a/home/home_news.html
+++ b/home/home_news.html
--- a/home/home_notice.html
+++ b/home/home_notice.html
--- a/home/home_top.html
+++ b/home/home_top.html
--- a/home/index.html
+++ b/home/index.html
--- a/home/large_dokeos_logo.gif
+++ b/home/large_dokeos_logo.gif
--- a/main/admin/example_session.csv
+++ b/main/admin/example_session.csv
--- a/main/admin/exemple.csv
+++ b/main/admin/exemple.csv
--- a/main/admin/specific_fields.php
+++ b/main/admin/specific_fields.php
--- a/main/admin/specific_fields_add.php
+++ b/main/admin/specific_fields_add.php
--- a/main/announcements/index.html
+++ b/main/announcements/index.html
--- a/main/app_share/AuthPanel.class
+++ b/main/app_share/AuthPanel.class
--- a/main/app_share/AuthPanel.java
+++ b/main/app_share/AuthPanel.java
--- a/main/app_share/ButtonPanel.class
+++ b/main/app_share/ButtonPanel.class
--- a/main/app_share/ButtonPanel.java
+++ b/main/app_share/ButtonPanel.java
--- a/main/app_share/ChangeLog
+++ b/main/app_share/ChangeLog
--- a/main/app_share/ClipboardFrame.class
+++ b/main/app_share/ClipboardFrame.class
--- a/main/app_share/ClipboardFrame.java
+++ b/main/app_share/ClipboardFrame.java
--- a/main/app_share/ConfigClientBean.class
+++ b/main/app_share/ConfigClientBean.class
--- a/main/app_share/ConfigClientBean.java
+++ b/main/app_share/ConfigClientBean.java
--- a/main/app_share/DH.class
+++ b/main/app_share/DH.class
--- a/main/app_share/DH.java
+++ b/main/app_share/DH.java
--- a/main/app_share/DesCipher.class
+++ b/main/app_share/DesCipher.class
--- a/main/app_share/DesCipher.java
+++ b/main/app_share/DesCipher.java
--- a/main/app_share/DokeosAppShare.exe
+++ b/main/app_share/DokeosAppShare.exe
--- a/main/app_share/FTPFrame.class
+++ b/main/app_share/FTPFrame.class
--- a/main/app_share/FTPFrame.java
+++ b/main/app_share/FTPFrame.java
--- a/main/app_share/IProtocolCommand.class
+++ b/main/app_share/IProtocolCommand.class
--- a/main/app_share/IProtocolCommand.java
+++ b/main/app_share/IProtocolCommand.java
--- a/main/app_share/LICENCE.TXT
+++ b/main/app_share/LICENCE.TXT
--- a/main/app_share/Makefile
+++ b/main/app_share/Makefile
--- a/main/app_share/NoctisRfbProto.class
+++ b/main/app_share/NoctisRfbProto.class
--- a/main/app_share/NoctisRfbProto.java
+++ b/main/app_share/NoctisRfbProto.java
--- a/main/app_share/NoctisVncCanvas.class
+++ b/main/app_share/NoctisVncCanvas.class
--- a/main/app_share/NoctisVncCanvas.java
+++ b/main/app_share/NoctisVncCanvas.java
--- a/main/app_share/OptionsFrame.class
+++ b/main/app_share/OptionsFrame.class
--- a/main/app_share/OptionsFrame.java
+++ b/main/app_share/OptionsFrame.java
--- a/main/app_share/POCConnection.class
+++ b/main/app_share/POCConnection.class
--- a/main/app_share/POCConnection.java
+++ b/main/app_share/POCConnection.java
--- a/main/app_share/README
+++ b/main/app_share/README
--- a/main/app_share/RecordingFrame.class
+++ b/main/app_share/RecordingFrame.class
--- a/main/app_share/RecordingFrame.java
+++ b/main/app_share/RecordingFrame.java
--- a/main/app_share/RfbProto.class
+++ b/main/app_share/RfbProto.class
--- a/main/app_share/RfbProto.java
+++ b/main/app_share/RfbProto.java
--- a/main/app_share/SessionRecorder.class
+++ b/main/app_share/SessionRecorder.class
--- a/main/app_share/SessionRecorder.java
+++ b/main/app_share/SessionRecorder.java
--- a/main/app_share/VncCanvas.class
+++ b/main/app_share/VncCanvas.class
--- a/main/app_share/VncCanvas.java
+++ b/main/app_share/VncCanvas.java
--- a/main/app_share/VncViewer.class
+++ b/main/app_share/VncViewer.class
--- a/main/app_share/VncViewer.jar
+++ b/main/app_share/VncViewer.jar
--- a/main/app_share/VncViewer.java
+++ b/main/app_share/VncViewer.java
--- a/main/app_share/dir.mk
+++ b/main/app_share/dir.mk
--- a/main/app_share/hextile.vnc
+++ b/main/app_share/hextile.vnc
--- a/main/app_share/index.vnc
+++ b/main/app_share/index.vnc
--- a/main/app_share/java.policy.applet
+++ b/main/app_share/java.policy.applet
--- a/main/app_share/mk.bat
+++ b/main/app_share/mk.bat
--- a/main/app_share/noshared.vnc
+++ b/main/app_share/noshared.vnc
--- a/main/app_share/relay/be/noctis/vnc/relay/IProtocolCommand.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/IProtocolCommand.class
--- a/main/app_share/relay/be/noctis/vnc/relay/IProtocolCommand.java
+++ b/main/app_share/relay/be/noctis/vnc/relay/IProtocolCommand.java
--- a/main/app_share/relay/be/noctis/vnc/relay/ProtocolBean.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/ProtocolBean.class
--- a/main/app_share/relay/be/noctis/vnc/relay/ProtocolBean.java
+++ b/main/app_share/relay/be/noctis/vnc/relay/ProtocolBean.java
--- a/main/app_share/relay/be/noctis/vnc/relay/Relay$ClientThread.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/Relay$ClientThread.class
--- a/main/app_share/relay/be/noctis/vnc/relay/Relay$ConnectClientThread.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/Relay$ConnectClientThread.class
--- a/main/app_share/relay/be/noctis/vnc/relay/Relay$RelayThread.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/Relay$RelayThread.class
--- a/main/app_share/relay/be/noctis/vnc/relay/Relay.class
+++ b/main/app_share/relay/be/noctis/vnc/relay/Relay.class
--- a/main/app_share/relay/be/noctis/vnc/relay/Relay.java
+++ b/main/app_share/relay/be/noctis/vnc/relay/Relay.java
--- a/main/app_share/run.bat
+++ b/main/app_share/run.bat
--- a/main/app_share/runapplet.bat
+++ b/main/app_share/runapplet.bat
--- a/main/app_share/screenshot.jpg
+++ b/main/app_share/screenshot.jpg
--- a/main/app_share/serverbootstrap/DokeosAppShare.sln
+++ b/main/app_share/serverbootstrap/DokeosAppShare.sln
--- a/main/app_share/serverbootstrap/DokeosAppShare/App.ico
+++ b/main/app_share/serverbootstrap/DokeosAppShare/App.ico
--- a/main/app_share/serverbootstrap/DokeosAppShare/CommandConnection.jsl
+++ b/main/app_share/serverbootstrap/DokeosAppShare/CommandConnection.jsl
--- a/Show More
+++ b/Show More