merge

Browse Source

skala

christian1827 15 years ago

parent 84a0f4321f

commit 9620389815

4894 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

1. 0
     chamilo_license.txt
2. 0
     documentation/index.html
3. 0
     documentation/installation_guide_es_ES.html
4. 0
     dokeos_license.txt
5. 0
     favicon.ico
6. 0
     home/home_tabs.html
7. 0
     home/register_top.html
8. 0
     license.txt
9. 0
     main/admin/access_url_add_courses_to_url.php
10. 0
      main/admin/access_url_add_sessions_to_url.php
11. 0
      main/admin/access_url_add_users_to_url.php
12. 0
      main/admin/access_url_edit_courses_to_url.php
13. 0
      main/admin/access_url_edit_sessions_to_url.php
14. 0
      main/admin/access_url_edit_users_to_url.php
15. 0
      main/admin/calendar_ical_export.php
16. 0
      main/admin/calendar_tbl_change.js
17. 0
      main/admin/calendar_view.php
18. 0
      main/admin/calendar_view_print.php
19. 0
      main/admin/course_edit.php
20. 0
      main/admin/settings.lib.php
21. 0
      main/admin/system_status.php
22. 0
      main/attendance/index.php
23. 0
      main/auth/lost_password.lib.php
24. 0
      main/blog/blog.php
25. 0
      main/chat/chat_banner.php
26. 0
      main/chat/chat_chat.php
27. 0
      main/chat/chat_hidden.php
28. 0
      main/chat/chat_message.php
29. 0
      main/chat/chat_whoisonline.php
30. 0
      main/chat/footer_frame.inc.php
31. 0
      main/chat/header_frame.inc.php
32. 0
      main/conference/index.php
33. 0
      main/conference/resources/themes/darkblue/background.png
34. 0
      main/conference/resources/themes/darkblue/background2.png
35. 0
      main/conference/resources/themes/darkblue/backgroundsanspied.png
36. 0
      main/conference/resources/themes/darkblue/buttons/menudraw_down.png
37. 0
      main/conference/resources/themes/darkblue/buttons/menudraw_over.png
38. 0
      main/conference/resources/themes/darkblue/buttons/menudraw_over.swf
39. 0
      main/conference/resources/themes/darkblue/buttons/menudraw_up.png
40. 0
      main/conference/resources/themes/darkblue/buttons/menudraw_up.swf
41. 0
      main/conference/resources/themes/darkblue/buttons/menupointer.png
42. 0
      main/conference/resources/themes/darkblue/buttons/menuseperator.png
43. 0
      main/conference/resources/themes/darkblue/buttons/messagebox_info.png
44. 0
      main/conference/resources/themes/darkblue/buttons/mix_record.png
45. 0
      main/conference/resources/themes/darkblue/buttons/next.png
46. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_dn_lf.png
47. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_dn_mid.png
48. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_dn_re.png
49. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_mo_lf.png
50. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_mo_mid.png
51. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_mo_re.png
52. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_up_lf.png
53. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_up_mid.png
54. 0
      main/conference/resources/themes/darkblue/buttons/tabbutton_up_re.png
55. 0
      main/conference/resources/themes/darkblue/buttons/top.png
56. 0
      main/conference/resources/themes/grey/background.png
57. 0
      main/conference/resources/themes/grey/buttons/menudraw_down.png
58. 0
      main/conference/resources/themes/grey/buttons/menudraw_over.png
59. 0
      main/conference/resources/themes/grey/buttons/menudraw_over.swf
60. 0
      main/conference/resources/themes/grey/buttons/menudraw_up.png
61. 0
      main/conference/resources/themes/grey/buttons/menudraw_up.swf
62. 0
      main/conference/resources/themes/grey/buttons/menupointer.png
63. 0
      main/conference/resources/themes/grey/buttons/menuseperator.png
64. 0
      main/conference/resources/themes/grey/buttons/messagebox_info.png
65. 0
      main/conference/resources/themes/grey/buttons/mix_record.png
66. 0
      main/conference/resources/themes/grey/buttons/next.png
67. 0
      main/conference/resources/themes/grey/buttons/tabbutton_dn_lf.png
68. 0
      main/conference/resources/themes/grey/buttons/tabbutton_dn_mid.png
69. 0
      main/conference/resources/themes/grey/buttons/tabbutton_dn_re.png
70. 0
      main/conference/resources/themes/grey/buttons/tabbutton_mo_lf.png
71. 0
      main/conference/resources/themes/grey/buttons/tabbutton_mo_mid.png
72. 0
      main/conference/resources/themes/grey/buttons/tabbutton_mo_re.png
73. 0
      main/conference/resources/themes/grey/buttons/tabbutton_up_lf.png
74. 0
      main/conference/resources/themes/grey/buttons/tabbutton_up_mid.png
75. 0
      main/conference/resources/themes/grey/buttons/tabbutton_up_re.png
76. 0
      main/conference/resources/themes/grey/buttons/top.png
77. 0
      main/coursecopy/classes/Survey.class.php
78. 0
      main/coursecopy/classes/SurveyInvitation.class.php
79. 0
      main/coursecopy/classes/SurveyQuestion.class.php
80. 0
      main/css/academica/images/2leftarrow.gif
81. 0
      main/css/academica/images/2rightarrow.gif
82. 0
      main/css/baby_orange/course.css
83. 0
      main/css/baby_orange/frames.css
84. 0
      main/css/baby_orange/images/2leftarrow.gif
85. 0
      main/css/baby_orange/images/2rightarrow.gif
86. 0
      main/css/baby_orange/images/alert.jpg
87. 0
      main/css/baby_orange/images/bar_1.gif
88. 0
      main/css/baby_orange/images/bar_1m.gif
89. 0
      main/css/baby_orange/images/bar_1r.gif
90. 0
      main/css/baby_orange/images/bar_1u.gif
91. 0
      main/css/baby_orange/images/bg.jpg
92. 0
      main/css/baby_orange/images/bgheader.jpg
93. 0
      main/css/baby_orange/images/bglogin.jpg
94. 0
      main/css/baby_orange/images/bgloginconf.jpg
95. 0
      main/css/baby_orange/images/divider.jpg
96. 0
      main/css/baby_orange/images/divider2.jpg
97. 0
      main/css/baby_orange/images/dropbox.jpg
98. 0
      main/css/baby_orange/images/headerform.jpg
99. 0
      main/css/baby_orange/images/headerform2.jpg
100. 0
       main/css/baby_orange/images/headerform3.jpg
101. Some files were not shown because too many files have changed in this diff Show More

0

chamilo_license.txt

Unescape Escape View File

0

documentation/index.html

Unescape Escape View File

0

documentation/installation_guide_es_ES.html

Unescape Escape View File

0

dokeos_license.txt

Unescape Escape View File

0

favicon.ico

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

0

home/home_tabs.html

Unescape Escape View File

0

home/register_top.html

Unescape Escape View File

0

license.txt

Unescape Escape View File

0

main/admin/access_url_add_courses_to_url.php

Unescape Escape View File

0

main/admin/access_url_add_sessions_to_url.php

Unescape Escape View File

0

main/admin/access_url_add_users_to_url.php

Unescape Escape View File

0

main/admin/access_url_edit_courses_to_url.php

Unescape Escape View File

0

main/admin/access_url_edit_sessions_to_url.php

Unescape Escape View File

0

main/admin/access_url_edit_users_to_url.php

Unescape Escape View File

0

main/admin/calendar_ical_export.php

Unescape Escape View File

0

main/admin/calendar_tbl_change.js

Unescape Escape View File

0

main/admin/calendar_view.php

Unescape Escape View File

0

main/admin/calendar_view_print.php

Unescape Escape View File

0

main/admin/course_edit.php

Unescape Escape View File

0

main/admin/settings.lib.php

Unescape Escape View File

0

main/admin/system_status.php

Unescape Escape View File

0

main/attendance/index.php

Unescape Escape View File

0

main/auth/lost_password.lib.php

Unescape Escape View File

0

main/blog/blog.php

Unescape Escape View File

0

main/chat/chat_banner.php

Unescape Escape View File

0

main/chat/chat_chat.php

Unescape Escape View File

0

main/chat/chat_hidden.php

Unescape Escape View File

0

main/chat/chat_message.php

Unescape Escape View File

0

main/chat/chat_whoisonline.php

Unescape Escape View File

0

main/chat/footer_frame.inc.php

Unescape Escape View File

0

main/chat/header_frame.inc.php

Unescape Escape View File

0

main/conference/index.php

Unescape Escape View File

0

main/conference/resources/themes/darkblue/background.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 122 KiB After Width:  |  Height:  |  Size: 122 KiB

0

main/conference/resources/themes/darkblue/background2.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 30 KiB

0

main/conference/resources/themes/darkblue/backgroundsanspied.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 81 KiB After Width:  |  Height:  |  Size: 81 KiB

0

main/conference/resources/themes/darkblue/buttons/menudraw_down.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 230 B

0

main/conference/resources/themes/darkblue/buttons/menudraw_over.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 254 B After Width:  |  Height:  |  Size: 254 B

0

main/conference/resources/themes/darkblue/buttons/menudraw_over.swf

Unescape Escape View File

0

main/conference/resources/themes/darkblue/buttons/menudraw_up.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 227 B

0

main/conference/resources/themes/darkblue/buttons/menudraw_up.swf

Unescape Escape View File

0

main/conference/resources/themes/darkblue/buttons/menupointer.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 441 B After Width:  |  Height:  |  Size: 441 B

0

main/conference/resources/themes/darkblue/buttons/menuseperator.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 155 B After Width:  |  Height:  |  Size: 155 B

0

main/conference/resources/themes/darkblue/buttons/messagebox_info.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 978 B After Width:  |  Height:  |  Size: 978 B

0

main/conference/resources/themes/darkblue/buttons/mix_record.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

main/conference/resources/themes/darkblue/buttons/next.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 210 B After Width:  |  Height:  |  Size: 210 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_dn_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 332 B After Width:  |  Height:  |  Size: 332 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_dn_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_dn_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 362 B After Width:  |  Height:  |  Size: 362 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_mo_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 323 B After Width:  |  Height:  |  Size: 323 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_mo_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_mo_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 367 B After Width:  |  Height:  |  Size: 367 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_up_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 332 B After Width:  |  Height:  |  Size: 332 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_up_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 166 B After Width:  |  Height:  |  Size: 166 B

0

main/conference/resources/themes/darkblue/buttons/tabbutton_up_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 363 B

0

main/conference/resources/themes/darkblue/buttons/top.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 987 B After Width:  |  Height:  |  Size: 987 B

0

main/conference/resources/themes/grey/background.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 122 KiB After Width:  |  Height:  |  Size: 122 KiB

0

main/conference/resources/themes/grey/buttons/menudraw_down.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 230 B

0

main/conference/resources/themes/grey/buttons/menudraw_over.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 254 B After Width:  |  Height:  |  Size: 254 B

0

main/conference/resources/themes/grey/buttons/menudraw_over.swf

Unescape Escape View File

0

main/conference/resources/themes/grey/buttons/menudraw_up.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 227 B

0

main/conference/resources/themes/grey/buttons/menudraw_up.swf

Unescape Escape View File

0

main/conference/resources/themes/grey/buttons/menupointer.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 441 B After Width:  |  Height:  |  Size: 441 B

0

main/conference/resources/themes/grey/buttons/menuseperator.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 155 B After Width:  |  Height:  |  Size: 155 B

0

main/conference/resources/themes/grey/buttons/messagebox_info.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 978 B After Width:  |  Height:  |  Size: 978 B

0

main/conference/resources/themes/grey/buttons/mix_record.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

main/conference/resources/themes/grey/buttons/next.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 210 B After Width:  |  Height:  |  Size: 210 B

0

main/conference/resources/themes/grey/buttons/tabbutton_dn_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 309 B After Width:  |  Height:  |  Size: 309 B

0

main/conference/resources/themes/grey/buttons/tabbutton_dn_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

main/conference/resources/themes/grey/buttons/tabbutton_dn_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 344 B

0

main/conference/resources/themes/grey/buttons/tabbutton_mo_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 309 B After Width:  |  Height:  |  Size: 309 B

0

main/conference/resources/themes/grey/buttons/tabbutton_mo_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 168 B

0

main/conference/resources/themes/grey/buttons/tabbutton_mo_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 344 B

0

main/conference/resources/themes/grey/buttons/tabbutton_up_lf.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 312 B After Width:  |  Height:  |  Size: 312 B

0

main/conference/resources/themes/grey/buttons/tabbutton_up_mid.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 166 B After Width:  |  Height:  |  Size: 166 B

0

main/conference/resources/themes/grey/buttons/tabbutton_up_re.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 344 B

0

main/conference/resources/themes/grey/buttons/top.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 987 B After Width:  |  Height:  |  Size: 987 B

0

main/coursecopy/classes/Survey.class.php

Unescape Escape View File

0

main/coursecopy/classes/SurveyInvitation.class.php

Unescape Escape View File

0

main/coursecopy/classes/SurveyQuestion.class.php

Unescape Escape View File

0

main/css/academica/images/2leftarrow.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

main/css/academica/images/2rightarrow.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

main/css/baby_orange/course.css

Unescape Escape View File

0

main/css/baby_orange/frames.css

Unescape Escape View File

0

main/css/baby_orange/images/2leftarrow.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

main/css/baby_orange/images/2rightarrow.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

main/css/baby_orange/images/alert.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.3 KiB

0

main/css/baby_orange/images/bar_1.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 803 B After Width:  |  Height:  |  Size: 803 B

0

main/css/baby_orange/images/bar_1m.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 807 B After Width:  |  Height:  |  Size: 807 B

0

main/css/baby_orange/images/bar_1r.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 804 B After Width:  |  Height:  |  Size: 804 B

0

main/css/baby_orange/images/bar_1u.gif

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 419 B After Width:  |  Height:  |  Size: 419 B

0

main/css/baby_orange/images/bg.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

main/css/baby_orange/images/bgheader.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 702 B After Width:  |  Height:  |  Size: 702 B

0

main/css/baby_orange/images/bglogin.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

main/css/baby_orange/images/bgloginconf.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.2 KiB

0

main/css/baby_orange/images/divider.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.0 KiB After Width:  |  Height:  |  Size: 7.0 KiB

0

main/css/baby_orange/images/divider2.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

0

main/css/baby_orange/images/dropbox.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

main/css/baby_orange/images/headerform.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.8 KiB After Width:  |  Height:  |  Size: 6.8 KiB

0

main/css/baby_orange/images/headerform2.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.5 KiB After Width:  |  Height:  |  Size: 7.5 KiB

0

main/css/baby_orange/images/headerform3.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.1 KiB After Width:  |  Height:  |  Size: 7.1 KiB

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save