Alex Aragon
|
ab6bebf971
|
fix toolbar admin css
|
9 years ago |
Yannick Warnier
|
b7b5ea5bd4
|
Minor - DB config change in travis config
|
9 years ago |
Yannick Warnier
|
a8b71e46f8
|
Minor - Memory limit change attempt for composer executing in travis (2)
|
9 years ago |
Yannick Warnier
|
a30a4b7a1c
|
Minor - Memory limit change attempt for composer executing in travis
|
9 years ago |
Yannick Warnier
|
9dd5f2c8e1
|
Minor - Testing variation of travis config
|
9 years ago |
Yannick Warnier
|
f803a72dd0
|
Minor - Testing variation of travis config
|
9 years ago |
Angel Fernando Quiroz Campos
|
c0c810b1fe
|
Add Work Report - refs BT#11031
|
9 years ago |
jmontoyaa
|
faf0072b5f
|
Fix import
|
9 years ago |
jmontoyaa
|
97580f2886
|
Fix installation add version table.
|
9 years ago |
jmontoyaa
|
412e4b567e
|
Glossary updates see BT#10895
Remove glossary_title and glossary_comment madness.
Add update option when import from csv.
Format code.
Update docs.
|
9 years ago |
jmontoyaa
|
04cd41642c
|
Merge 1.10.x
|
9 years ago |
jmontoyaa
|
f539581ff2
|
Fix scorm export (images not appearing when importing scorm) see BT#11321
|
9 years ago |
jmontoyaa
|
d0b816e223
|
Minor - format code.
|
9 years ago |
jmontoyaa
|
83ee53db15
|
Fix pagination
|
9 years ago |
jmontoyaa
|
81c9ff76ff
|
Fix pagination
|
9 years ago |
jmontoyaa
|
20653fb019
|
Format code
|
9 years ago |
jmontoyaa
|
3658bab606
|
Merge
|
9 years ago |
jmontoyaa
|
b64adaa0bc
|
Fix pagination
|
9 years ago |
jmontoyaa
|
71f67f5b9d
|
Format code
|
9 years ago |
jmontoyaa
|
965c658031
|
Fix pagination
|
9 years ago |
Yannick Warnier
|
577f684e3e
|
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
|
9 years ago |
Yannick Warnier
|
c0be3e7ace
|
Minor - Add comment about courserecycler query to remove orphan questions - refs BT#11333
|
9 years ago |
José Loguercio
|
f9fb07870b
|
Merge pull request #1235 from jloguercio/1.10.x
Added official code in "who is online" page (1.10.x) - BT#11033
|
9 years ago |
José Loguercio
|
4eeb289449
|
Added official code in "who is online" page - BT#11033
Conflicts:
main/install/data.sql
|
9 years ago |
José Loguercio
|
1d91e087d6
|
Merge pull request #1234 from jloguercio/1.11.x
Minor validation fix on geolocalization extra_field
|
9 years ago |
José Loguercio
|
938e0ed873
|
Minor validation fix on geolocalization extra_field
|
9 years ago |
José Loguercio
|
25332039f0
|
Merge pull request #1233 from jloguercio/1.11.x
Added official code in "who is online" page - BT#11033
|
9 years ago |
José Loguercio
|
35b75b2a49
|
Added official code in "who is online" page - BT#11033
|
9 years ago |
José Loguercio
|
525d2d84e9
|
Merge pull request #1232 from jloguercio/1.11.x
Added maps handle for every geolocalization extra_field - Refs BT#10992
|
9 years ago |
José Loguercio
|
21a59e55c8
|
Added maps handle for every geolocalization extra_field - Refs BT#10992
|
9 years ago |
Angel Fernando Quiroz Campos
|
e96a6fe873
|
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
|
9 years ago |
Angel Fernando Quiroz Campos
|
f64e6b89f7
|
Remove webchatdeny.php
|
9 years ago |
José Loguercio
|
fbf9a87da6
|
Merge pull request #1231 from jloguercio/1.11.x
Allow students to edit the wiki page and fix lock page only for trainers - Refs #8299
|
9 years ago |
José Loguercio
|
39b620185f
|
Allow students to edit the wiki page and fix lock page only for trainers - Refs #8299
|
9 years ago |
Angel Fernando Quiroz Campos
|
f9ffa0fccf
|
Renew course chat - refs BT#11284 #tmi (#1225)
* Fix get history files from course chat - refs BT#11284
* Clean code + Create template for course chat - refs BT#11284
* Renew course chat - refs BT#11284
* Allow course chat between two users - refs BT#11284
* Improve course chat style and template - refs BT#11284
* Add event when user access to chat tool - refs BT#11284
* Show all course users instead of connected users only - refs BT#11284
* Fix course chat in basis courses - refs BT#111284
* Filter users on chat by course - refs BT#11284
* Update jquery.textcomplete.js - refs BT#11248
* Fix autocomplete for emojis in course chat - refs BT#11284
* Search url in messages for course chat - refs BT#11284
* Add ctrl + Enter event to send messages in course chat - refs BT#11284
|
9 years ago |
jmontoyaa
|
d4cbcec037
|
Format code , remove unused code.
|
9 years ago |
jmontoyaa
|
f9222e16bc
|
Add option to send email to all admins that a new user is registered. (option turned off)
Add code from ofaj branch
|
9 years ago |
jmontoyaa
|
81b59fb98c
|
Format code
|
9 years ago |
jmontoyaa
|
ecf24659ef
|
Allow add question if force_edit_exercise_in_lp = true see BT#11315
|
9 years ago |
jmontoyaa
|
e3ec03175b
|
Fix link
|
9 years ago |
Yannick Warnier
|
e3f8c7f338
|
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
|
9 years ago |
Alex Aragon Calixto
|
00da0675bf
|
Merge pull request #1230 from aragonc/1.11.x
fix actions admin part-2
|
9 years ago |
Alex Aragon
|
8305960050
|
fix actions admin part-2
|
9 years ago |
Angel Fernando Quiroz Campos
|
bcfdf70f75
|
Renew course chat - refs BT#11284 #tmi (#1225)
* Fix get history files from course chat - refs BT#11284
* Clean code + Create template for course chat - refs BT#11284
* Renew course chat - refs BT#11284
* Allow course chat between two users - refs BT#11284
* Improve course chat style and template - refs BT#11284
* Add event when user access to chat tool - refs BT#11284
* Show all course users instead of connected users only - refs BT#11284
* Fix course chat in basis courses - refs BT#111284
* Filter users on chat by course - refs BT#11284
* Update jquery.textcomplete.js - refs BT#11248
* Fix autocomplete for emojis in course chat - refs BT#11284
* Search url in messages for course chat - refs BT#11284
* Add ctrl + Enter event to send messages in course chat - refs BT#11284
|
9 years ago |
Alex Aragon Calixto
|
cc32d89bba
|
Merge pull request #1229 from aragonc/1.11.x
fix css default theme and help
|
9 years ago |
Alex Aragon
|
3ac95c96dd
|
fix css default theme and help
|
9 years ago |
Alex Aragon Calixto
|
1d0c4c3922
|
Merge pull request #1228 from aragonc/1.11.x
fix css default theme and help
|
9 years ago |
Alex Aragon
|
31dcd7e86b
|
fix css default theme and help
|
9 years ago |
José Loguercio
|
83c6522ac0
|
Merge pull request #1227 from jloguercio/1.11.x
Fix Session delete if documents inside
|
9 years ago |
José Loguercio
|
0b1610e50e
|
Fix Session delete if documents inside
|
9 years ago |