Angel Fernando Quiroz Campos
|
c94787cda4
|
Add description to session - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
a78325f921
|
Comporser update - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
d0902ab4ce
|
Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 9049
Conflicts:
main/inc/lib/sessionmanager.lib.php
main/install/db_main.sql
main/install/migrate-db-1.9.0-1.10.0-pre.sql
vendor/autoload.php
vendor/composer/autoload_real.php
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
52b2340bc2
|
Composer update - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
5437713c7a
|
Update icons path - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
3512ea4f7c
|
Integrate Advanced Session in the core - refs BT#9049
|
11 years ago |
|
Yannick Warnier
|
cc1a647f76
|
Merge pull request #478 from AngelFQC/BT9087
Display courses without session in report - refs BT#9087
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
fe3852bec1
|
Replace function to get the scorm time - refs BT#9087
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
3838af2cb9
|
Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into BT9087
Conflicts:
main/inc/lib/usermanager.lib.php
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
5cfacae8b4
|
Format time with PHP - refs BT#9087
|
11 years ago |
|
Yannick Warnier
|
c1cd77ce0c
|
Update translations
|
11 years ago |
|
Yannick Warnier
|
ea6311ca62
|
Merge branch 'AngelFQC-9084' into 1.10.x
|
11 years ago |
|
Yannick Warnier
|
c704973e0a
|
Fixed parse error in myStudents page - refs BT#9084
|
11 years ago |
|
Yannick Warnier
|
3511158473
|
Update (restrict) is_allowedToEdit condition to avoid giving too much freedom to student boss - refs BT#9084
|
11 years ago |
|
Yannick Warnier
|
127b483bd6
|
Update translations
|
11 years ago |
|
Yannick Warnier
|
56ee9b537b
|
Improve language variable
|
11 years ago |
|
Yannick Warnier
|
fd6e93d2d2
|
Add $relationType filter - refs BT#9084
|
11 years ago |
|
Yannick Warnier
|
48dc81d229
|
Fix details in db upgrade - refs BT#9084
|
11 years ago |
|
Yannick Warnier
|
7af3e9b828
|
Update translations
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
424349a0b5
|
Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 9084
Conflicts:
main/inc/lib/usermanager.lib.php
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
3cf13a775d
|
Integrate Advanced Skills plugin in the core - refs BT#9084
|
11 years ago |
|
Julio Montoya
|
60b057d7e2
|
git pushMerge branch '1.10.x' of ssh://github.com/chamilo/chamilo-lms into 1.10.x
|
11 years ago |
|
Julio Montoya
|
50833f8c31
|
Merge branch '1.9.x' into 1.10.x
|
11 years ago |
|
Julio Montoya
|
8915665129
|
Fixes table header see BT#9270
|
11 years ago |
|
Julio Montoya
|
b71d43e8fd
|
Minor - format code.
|
11 years ago |
|
Julio Montoya
|
5e391e2348
|
Minor - Fixes PHP warnings.
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
bb90300f23
|
Change variable name with PSR - refs BT#9084
|
11 years ago |
|
Julio Montoya
|
9418d8da68
|
Minor - format code.
|
11 years ago |
|
Yannick Warnier
|
f756c4b950
|
Fix broken link to user information page in activities statistics for admin
|
11 years ago |
|
Julio Montoya
|
178b2763ea
|
Fixes user sorting see BT#9287
|
11 years ago |
|
Julio Montoya
|
5c93cb5b1a
|
Merge branch '1.10.x' of ssh://github.com/chamilo/chamilo-lms into 1.10.x
|
11 years ago |
|
Julio Montoya
|
024bd3466a
|
Minor - adding trim
|
11 years ago |
|
Yannick Warnier
|
7b461f60b6
|
Merge pull request #461 from AngelFQC/BT9086
Setting conection time - refs BT#9086
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
8cbd05a6bd
|
Don't run from browser - refs BT#9086
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
cf32295ec2
|
Minor - Add explanation - refs BT#9086
|
11 years ago |
|
Yannick Warnier
|
aaf145a239
|
Merge branch 'danbarretodev-CT7408' into 1.10.x
|
11 years ago |
|
Yannick Warnier
|
6a01e139b1
|
Add c-pchart from vendor as downloaded by composer
|
11 years ago |
|
Yannick Warnier
|
ab97ce2abd
|
Add c-pchart from vendor as downloaded by composer
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
ced56e27fc
|
Composer update - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
8a10618431
|
Don't require plugin class - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
c637b0c7fb
|
Rename plugin const name - refs BT#9049
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
3d1a955c28
|
Update plugin lang variable - refs BT#9049
|
11 years ago |
|
Daniel Barreto
|
e021de30c4
|
Update palette use - refs CT#7408
|
11 years ago |
|
Daniel Barreto
|
8b0b3150c2
|
Add pChart class uses - refs CT#7408
|
11 years ago |
|
Daniel Barreto
|
e139be2e72
|
Merge branch '1.10.x' into CT7408
Conflicts:
composer.json
vendor/autoload.php
vendor/composer/autoload_classmap.php
vendor/composer/autoload_real.php
vendor/composer/installed.json
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
27da74e944
|
Display courses without session in report - refs BT#9087
|
11 years ago |
|
Daniel Barreto
|
2336efaba0
|
Add default pchart template - refs CT#7408
|
11 years ago |
|
Angel Fernando Quiroz Campos
|
21937d1256
|
Fix update teachers in courses - refs BT#9086
|
11 years ago |
|
Yannick Warnier
|
8e8c7997b4
|
Improve use of db_client_flags setting
|
11 years ago |
|
Yannick Warnier
|
4e3d895719
|
Language update
|
11 years ago |
