 Nicolas Ducoulombier
|
6f6e18914e
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
5 years ago |
|
Nicolas Ducoulombier
|
6274f16157
Merge remote-tracking branch 'upstream/ofaj_dev' into preprodparkur
|
5 years ago |
 Julio Montoya
|
1f232314dd
Update after merge with 1.11.x
|
5 years ago |
|
Nicolas Ducoulombier
|
e8e24d75c9
fix merge
|
5 years ago |
|
Julio Montoya
|
f5dfcef3a1
Partial merge with 1.11.x see BT#15952
|
5 years ago |
|
Nicolas Ducoulombier
|
a9fe0efc7f
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
5 years ago |
 Alex Aragón
|
02b802a21f
fix changes ofaj - refs #15939
|
5 years ago |
|
Alex Aragón
|
e7dc0d3c8d
fix changes ofaj - refs #15939
|
5 years ago |
|
Nicolas Ducoulombier
|
8640ee042d
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
5 years ago |
|
Alex Aragón
|
ae3807fbd5
fix colors
|
5 years ago |
|
Alex Aragón
|
9a3bda5e23
fix colors
|
5 years ago |
|
Alex Aragón
|
c08b6eb002
fix colors
|
5 years ago |
|
Alex Aragón
|
f949d61628
fix colors
|
5 years ago |
|
Nicolas Ducoulombier
|
49f01e12de
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
5 years ago |
|
Julio Montoya
|
a4c69455c6
Fix default font see BT#15554
|
5 years ago |
|
Nicolas Ducoulombier
|
31ec98f8f0
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
5 years ago |
|
Julio Montoya
|
54ebb2dbe7
Merge from 1.11.x
|
5 years ago |
|
Nicolas Ducoulombier
|
2a4263c91a
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
6 years ago |
|
Alex Aragón
|
9c956a7dda
fix style message - refs BT#15099
|
6 years ago |
|
Nicolas Ducoulombier
|
f7d9186e76
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
6 years ago |
|
Alex Aragón
|
c7ae005825
fix update fullpage ckeditor new message - refs BT#14955
|
6 years ago |
|
Nicolas Ducoulombier
|
c227103d7f
Merge remote-tracking branch 'upstream/preprodparkur' into ofaj
|
6 years ago |
|
Julio
|
0a345a939a
Add voice recorder button when sending a msg in the chamilo inbox
|
6 years ago |
|
jmontoyaa
|
4bf22d97ff
When forwarding a message, also forward attachment files see BT#14332
|
6 years ago |
|
jmontoyaa
|
caad4bbb94
Add setting "disable_token_in_new_message" see BT#14113
|
6 years ago |
|
Nicolas Ducoulombier
|
274393ca91
Fix merge with preprodparkur
|
6 years ago |
 Julio Montoya
|
7f6a146fd3
Applied fixes from FlintCI
|
6 years ago |
|
Julio Montoya
|
ecdc2037e2
Applied fixes from FlintCI
|
6 years ago |
|
Nicolas Ducoulombier
|
2a2feab91d
Fixing merge with preprodparkur -refs BT#13830
|
7 years ago |
|
Julio Montoya
|
bf885f42f4
Applied fixes from FlintCI
|
7 years ago |
