merge

Browse Source

1.9.x

aragonc 11 years ago

parent 1c1fb99a80

commit 4116a6b100

806 changed files with 0 additions and 0 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
     .gitignore
2. 0
     .travis.yml
3. 0
     404.php
4. 0
     README.txt
5. 0
     apple-touch-icon.png
6. 0
     archive/.htaccess
7. 0
     certificates/index.php
8. 0
     composer.json
9. 0
     custompages/README
10. 0
      custompages/first_login.php
11. 0
      custompages/images/footer.png
12. 0
      custompages/images/header.png
13. 0
      custompages/images/login-form-submit-bg.jpg
14. 0
      custompages/images/page-background.png
15. 0
      custompages/index-logged.php
16. 0
      custompages/index-unlogged.php
17. 0
      custompages/language.inc.php
18. 0
      custompages/language.php
19. 0
      custompages/loggedout.php
20. 0
      custompages/lostpassword.php
21. 0
      custompages/registration-feedback.php
22. 0
      custompages/registration.php
23. 0
      custompages/style-ie6.css
24. 0
      custompages/style.css
25. 0
      custompages/url-images/README
26. 0
      documentation/changelog.html
27. 0
      documentation/credits.html
28. 0
      documentation/default.css
29. 0
      documentation/dependencies.html
30. 0
      documentation/index.html
31. 0
      documentation/installation_guide.html
32. 0
      documentation/installation_guide_es_ES.html
33. 0
      documentation/license.html
34. 0
      documentation/migration-checklist.html
35. 0
      documentation/optimization.html
36. 0
      documentation/readme.html
37. 0
      documentation/security.html
38. 0
      favicon.ico
39. 0
      htaccess
40. 0
      index.php
41. 0
      license.txt
42. 0
      main/admin/extra_field_options.php
43. 0
      main/admin/extra_field_workflow.php
44. 0
      main/admin/extra_fields.php
45. 0
      main/auth/set_temp_password.php
46. 0
      main/chat/sound/notification.mp3
47. 0
      main/chat/sound/notification.ogg
48. 0
      main/chat/sound/notification.wav
49. 0
      main/css/academica/images/user_icon.png
50. 0
      main/css/academica/images/user_password.png
51. 0
      main/css/baby_orange/images/bg-button.png
52. 0
      main/css/baby_orange/images/button_accept.png
53. 0
      main/css/baby_orange/images/button_minus.png
54. 0
      main/css/baby_orange/images/button_plus_blue.png
55. 0
      main/css/baby_orange/images/button_plus_green.png
56. 0
      main/css/baby_orange/images/user_icon.png
57. 0
      main/css/baby_orange/images/user_password.png
58. 0
      main/css/bg-scrollbar-thumb-y.png
59. 0
      main/css/bg-scrollbar-track-y.png
60. 0
      main/css/bg-scrollbar-trackend-y.png
61. 0
      main/css/chamilo/images/bg-button.png
62. 0
      main/css/chamilo/images/button_accept.png
63. 0
      main/css/chamilo/images/button_minus.png
64. 0
      main/css/chamilo/images/button_plus_blue.png
65. 0
      main/css/chamilo/images/button_plus_green.png
66. 0
      main/css/chamilo/images/user_icon.png
67. 0
      main/css/chamilo/images/user_password.png
68. 0
      main/css/chamilo_electric_blue/images/accept.png
69. 0
      main/css/chamilo_electric_blue/images/accept_data.png
70. 0
      main/css/chamilo_electric_blue/images/add.png
71. 0
      main/css/chamilo_electric_blue/images/buttom.png
72. 0
      main/css/chamilo_electric_blue/images/next.png
73. 0
      main/css/chamilo_electric_blue/images/previus.png
74. 0
      main/css/chamilo_green/images/accept.png
75. 0
      main/css/chamilo_green/images/accept_data.png
76. 0
      main/css/chamilo_green/images/add.png
77. 0
      main/css/chamilo_green/images/buttom.png
78. 0
      main/css/chamilo_green/images/next.png
79. 0
      main/css/chamilo_green/images/previus.png
80. 0
      main/css/chamilo_orange/images/accept.png
81. 0
      main/css/chamilo_orange/images/accept_data.png
82. 0
      main/css/chamilo_orange/images/add.png
83. 0
      main/css/chamilo_orange/images/buttom.png
84. 0
      main/css/chamilo_orange/images/next.png
85. 0
      main/css/chamilo_orange/images/previus.png
86. 0
      main/css/chamilo_red/images/accept.png
87. 0
      main/css/chamilo_red/images/accept_data.png
88. 0
      main/css/chamilo_red/images/add.png
89. 0
      main/css/chamilo_red/images/buttom.png
90. 0
      main/css/chamilo_red/images/next.png
91. 0
      main/css/chamilo_red/images/previus.png
92. 0
      main/css/chat.css
93. 0
      main/css/chat.png
94. 0
      main/css/default_scorm.css
95. 0
      main/css/journal/dataTable.css
96. 0
      main/css/journal/frames.css
97. 0
      main/css/journal/images/2leftarrow.gif
98. 0
      main/css/journal/images/2rightarrow.gif
99. 0
      main/css/journal/images/accept.png
100. 0
       main/css/journal/images/accept_data.png
101. Some files were not shown because too many files have changed in this diff Show More

0

.gitignore vendored

Unescape Escape View File

0

.travis.yml

Unescape Escape View File

0

404.php

Unescape Escape View File

0

README.txt

Unescape Escape View File

0

apple-touch-icon.png

Unescape Escape View File

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

0

archive/.htaccess

Unescape Escape View File

0

certificates/index.php

Unescape Escape View File

0

composer.json

Unescape Escape View File

0

custompages/README

Unescape Escape View File

0

custompages/first_login.php

Unescape Escape View File

0

custompages/images/footer.png

Unescape Escape View File

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

0

custompages/images/header.png

Unescape Escape View File

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

0

custompages/images/login-form-submit-bg.jpg

Unescape Escape View File

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

0

custompages/images/page-background.png

Unescape Escape View File

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

0

custompages/index-logged.php

Unescape Escape View File

0

custompages/index-unlogged.php

Unescape Escape View File

0

custompages/language.inc.php

Unescape Escape View File

0

custompages/language.php

Unescape Escape View File

0

custompages/loggedout.php

Unescape Escape View File

0

custompages/lostpassword.php

Unescape Escape View File

0

custompages/registration-feedback.php

Unescape Escape View File

0

custompages/registration.php

Unescape Escape View File

0

custompages/style-ie6.css

Unescape Escape View File

0

custompages/style.css

Unescape Escape View File

0

custompages/url-images/README

Unescape Escape View File

0

documentation/changelog.html

Unescape Escape View File

0

documentation/credits.html

Unescape Escape View File

0

documentation/default.css

Unescape Escape View File

0

documentation/dependencies.html

Unescape Escape View File

0

documentation/index.html

Unescape Escape View File

0

documentation/installation_guide.html

Unescape Escape View File

0

documentation/installation_guide_es_ES.html

Unescape Escape View File

0

documentation/license.html

Unescape Escape View File

0

documentation/migration-checklist.html

Unescape Escape View File

0

documentation/optimization.html

Unescape Escape View File

0

documentation/readme.html

Unescape Escape View File

0

documentation/security.html

Unescape Escape View File

0

favicon.ico

Unescape Escape View File

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

0

htaccess

Unescape Escape View File

0

index.php

Unescape Escape View File

0

license.txt

Unescape Escape View File

0

main/admin/extra_field_options.php

Unescape Escape View File

0

main/admin/extra_field_workflow.php

Unescape Escape View File

0

main/admin/extra_fields.php

Unescape Escape View File

0

main/auth/set_temp_password.php

Unescape Escape View File

0

main/chat/sound/notification.mp3

Unescape Escape View File

0

main/chat/sound/notification.ogg

Unescape Escape View File

0

main/chat/sound/notification.wav

Unescape Escape View File

0

main/css/academica/images/user_icon.png

Unescape Escape View File

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

0

main/css/academica/images/user_password.png

Unescape Escape View File

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

0

main/css/baby_orange/images/bg-button.png

Unescape Escape View File

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

0

main/css/baby_orange/images/button_accept.png

Unescape Escape View File

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

0

main/css/baby_orange/images/button_minus.png

Unescape Escape View File

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

0

main/css/baby_orange/images/button_plus_blue.png

Unescape Escape View File

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

0

main/css/baby_orange/images/button_plus_green.png

Unescape Escape View File

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

0

main/css/baby_orange/images/user_icon.png

Unescape Escape View File

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

0

main/css/baby_orange/images/user_password.png

Unescape Escape View File

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

0

main/css/bg-scrollbar-thumb-y.png

Unescape Escape View File

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

0

main/css/bg-scrollbar-track-y.png

Unescape Escape View File

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

0

main/css/bg-scrollbar-trackend-y.png

Unescape Escape View File

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

0

main/css/chamilo/images/bg-button.png

Unescape Escape View File

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

0

main/css/chamilo/images/button_accept.png

Unescape Escape View File

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

0

main/css/chamilo/images/button_minus.png

Unescape Escape View File

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

0

main/css/chamilo/images/button_plus_blue.png

Unescape Escape View File

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

0

main/css/chamilo/images/button_plus_green.png

Unescape Escape View File

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

0

main/css/chamilo/images/user_icon.png

Unescape Escape View File

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

0

main/css/chamilo/images/user_password.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/accept.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/accept_data.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/add.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/buttom.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/next.png

Unescape Escape View File

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

0

main/css/chamilo_electric_blue/images/previus.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/accept.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/accept_data.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/add.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/buttom.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/next.png

Unescape Escape View File

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

0

main/css/chamilo_green/images/previus.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/accept.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/accept_data.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/add.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/buttom.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/next.png

Unescape Escape View File

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

0

main/css/chamilo_orange/images/previus.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/accept.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/accept_data.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/add.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/buttom.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/next.png

Unescape Escape View File

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

0

main/css/chamilo_red/images/previus.png

Unescape Escape View File

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

0

main/css/chat.css

Unescape Escape View File

0

main/css/chat.png

Unescape Escape View File

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

0

main/css/default_scorm.css

Unescape Escape View File

0

main/css/journal/dataTable.css

Unescape Escape View File

0

main/css/journal/frames.css

Unescape Escape View File

0

main/css/journal/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/journal/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/journal/images/accept.png

Unescape Escape View File

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

0

main/css/journal/images/accept_data.png

Unescape Escape View File

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

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

Write Preview

Loading…

Cancel

Save