vgilc
|
5ac947c2fd
|
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
|
2018-11-20 11:33:00 +01:00 |
daniel
|
4dbcecb951
|
WIP custom fields view
|
2018-11-13 15:46:44 +01:00 |
fermin831
|
d63666cbbc
|
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
|
2018-11-08 14:00:49 +01:00 |
|
daniel
|
0b0bad8a73
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
|
2018-10-25 17:43:28 +02:00 |
manuel.montes
|
9d7f063ef2
|
Changed tlayout_template name table to varchar 600
|
2018-10-24 12:39:58 +02:00 |
|
fermin831
|
3946124cc7
|
Inaugurate the 22 mr with an alter table in talert_commands
|
2018-10-22 09:49:06 +02:00 |
|
daniel
|
a7918a1816
|
delete field flash chart php7
|
2018-10-19 11:56:49 +02:00 |