jmontoyaa
|
a03baa84be
Merge with 1.11.x
|
8 years ago |
Angel Fernando Quiroz Campos
|
8e0d3675e4
Merge pull request #1120 from AngelFQC/BT11060
|
8 years ago |
jmontoyaa
|
9a6a71bb36
Merge with 1.11.x
|
8 years ago |
jmontoyaa
|
c023e350c3
WIP vchamilo plugin - Force creation of master snapshot to setup a default template.
|
8 years ago |
Angel Fernando Quiroz Campos
|
810f8b5dcc
Use RecordRTC or Wami when adding audio to lp item - refs BT#11060
|
8 years ago |
jmontoyaa
|
496c64f518
Merge with 1.11.x
|
8 years ago |
jmontoyaa
|
2c31437ca9
Replace INCLUDE_PATH with SYS_INC_PATH
|
8 years ago |
jmontoyaa
|
c6de28f856
Merge with 1.10.x
|
8 years ago |
jmontoyaa
|
6b51fae1a3
Add function needed for BT#10052
|
8 years ago |
Julio
|
60d86ea992
Merge
|
8 years ago |
Julio
|
5bbf95e81d
Merge remote-tracking branch 'origin/1.10.x' into 1.11.x
|
8 years ago |
Julio
|
7dd9ca2e1c
Fix icon render.
|
8 years ago |
jmontoya
|
2ab0fd40ad
Remove unused files.
|
8 years ago |
jmontoya
|
25e3e86ca3
merge from 1.11.x
|
8 years ago |
jmontoya
|
b9768a98da
merge from 1.10.x
|
8 years ago |
jmontoya
|
3d39554195
Fix icon paths (needed for v2.0)
|
8 years ago |
jmontoya
|
94ad254dde
Fix UI
|
8 years ago |
jmontoya
|
21d1e0926f
Edit profile link, remove unused code.
|
8 years ago |
jmontoya
|
43640bbd79
merge from 1.11.x
|
9 years ago |
jmontoya
|
ee60711f19
merge from 1.10.x
|
9 years ago |
jmontoya
|
b65d66ae2e
Fix icons
|
9 years ago |
jmontoya
|
3ee9ab66ec
merge from 1.11.x
|
9 years ago |
jmontoya
|
6944e9a416
merge from 1.10.x
|
9 years ago |
jmontoya
|
c762b426da
Add Display::returnIconPath function instead of using custom /img/ path construction
|
9 years ago |
jmontoya
|
7842305e38
Moving icons from img/ to default icon folder icons/22
|
9 years ago |
jmontoya
|
93cae24e1d
Format code, use Session class, use Display::addFlash function.
|
9 years ago |
jmontoya
|
9f9cf73a1f
merge from 1.11.x
|
9 years ago |
jmontoya
|
5446e32386
Merge remote-tracking branch 'origin/1.10.x' into 1.11.x
|
9 years ago |
jmontoya
|
0458c389a7
Fix course theme see #8109
|
9 years ago |
jmontoya
|
a43ff833f8
Fix tabs using current bootstrap documentation
|
9 years ago |