Yannick Warnier
|
40300fae68
Minor - Remove check on MAX_FILE_SIZE in the admin settings update as it is NOT a setting for Chamilo, just a setting for the form
|
11 years ago |
Yannick Warnier
|
f61ce49676
Minor - improved presentation of watermark image in settings - refs #6587
|
11 years ago |
Julio Montoya
|
cb4a821025
Merge
|
11 years ago |
Julio Montoya
|
3d7612b787
Fixing curriculum routes (mine)
|
11 years ago |
Julio Montoya
|
15be76a44b
Fixing curriculum routes.
|
11 years ago |
Julio Montoya
|
da161d2d16
Updating routes and services.php
|
11 years ago |
Julio Montoya
|
98ade57cfd
Merge branch 'chamilo10'
|
11 years ago |
Julio Montoya
|
716e26561a
Fixing function call.
|
11 years ago |
Julio Montoya
|
277a5c3999
Updating favicon.
|
11 years ago |
Julio Montoya
|
efa6d5008e
Redo changes after merge.
|
11 years ago |
Yannick Warnier
|
4df94c8b64
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
|
11 years ago |
Yannick Warnier
|
9043b562c1
Fixed issue removing system watermark - refs #6587
|
11 years ago |
Julio Montoya
|
321ce65f18
Updating vendors
|
11 years ago |
Julio Montoya
|
e13a5e2238
Merge branch 'chamilo10'
|
11 years ago |
Julio Montoya
|
ccbd79b8ef
Fixing errors while auto merging.
|
11 years ago |
Julio Montoya
|
6f7d7a4bac
Updating mine installer after merge.
|
11 years ago |
Julio Montoya
|
2c11291949
Merging with 1.10
|
11 years ago |
Julio Montoya
|
657892308f
Removing vendors
|
11 years ago |
Julio Montoya
|
f46b4dad5c
Fixing error while auto merging.
|
11 years ago |
Julio Montoya
|
ec4a10e984
Updating vendors with chash.
|
11 years ago |
Julio Montoya
|
6b41312e65
Removing git chash submodule
|
11 years ago |
Julio Montoya
|
9a2336867f
Updating vendors
|
11 years ago |
Julio Montoya
|
438ab1bfa3
Updating vendors
|
11 years ago |
Julio Montoya
|
3b6ab4fcd0
Updating vendors
|
11 years ago |
Julio Montoya
|
4c12d8f2a4
Merge branch 'chamilo10'
|
11 years ago |
Julio Montoya
|
89b74a4af9
Merge with new features branch (mine)
|
11 years ago |
Julio Montoya
|
bb72d7d74a
Merge branch 'chamilo19'
|
11 years ago |
Julio Montoya
|
dc6ccd26ff
Fixing function calls statistics to Statistics
|
11 years ago |
Julio Montoya
|
7d39a6199a
Fixing version check for 1.10
|
11 years ago |
Julio Montoya
|
80fc2e8d3d
Merge branch 'chamilo19'
|
11 years ago |