marcos
|
8ca473b2a7
|
ajust search input
|
2019-12-11 18:42:46 +01:00 |
|
marcos
|
1430e6ee11
|
Update orderinterpreter class and css
|
2019-12-05 16:10:31 +01:00 |
|
marcos
|
a89a64cc1b
|
Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes
|
2019-12-05 15:05:54 +01:00 |
artica
|
0263060639
|
Auto-updated build strings.
|
2019-12-05 00:01:09 +01:00 |
|
marcos
|
fbb1e53362
|
update orderinterpreter
|
2019-12-04 17:28:03 +01:00 |
|
artica
|
0ba2d86971
|
Auto-updated build strings.
|
2019-12-04 00:01:08 +01:00 |
|
marcos
|
1f97fcef40
|
update css and preg_match
|
2019-12-03 18:31:13 +01:00 |
|
marcos
|
7eec91b946
|
Show result in normal window
|
2019-12-03 18:19:32 +01:00 |
vgilc
|
810fe8f860
|
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
This reverts merge request !2886
|
2019-12-03 15:59:08 +01:00 |
|
vgilc
|
809628560b
|
Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
Ent 4968 comandos de alerta con saltos de linea
See merge request artica/pandorafms!2886
|
2019-12-03 15:53:23 +01:00 |
|
marcos
|
14b8379ccb
|
ajax call, controller, class, match result, return array inputs(example to return)
|
2019-12-03 15:11:16 +01:00 |
|
marcos
|
631170bfe9
|
resolv blank page
|
2019-12-03 14:26:31 +01:00 |
|
marcos
|
90f17ebd46
|
Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes
|
2019-12-03 14:15:47 +01:00 |
|
marcos
|
d4720c2260
|
add firts changes
|
2019-12-03 13:59:03 +01:00 |
|
artica
|
60aaf4363e
|
Auto-updated build strings.
|
2019-12-03 00:01:07 +01:00 |
|
artica
|
80d5eea467
|
Auto-updated build strings.
|
2019-12-02 00:01:08 +01:00 |
|
artica
|
882198798a
|
Auto-updated build strings.
|
2019-12-01 00:01:06 +01:00 |
|
artica
|
a6f881c6fa
|
Auto-updated build strings.
|
2019-11-30 00:01:08 +01:00 |
|
artica
|
14999b7b84
|
Auto-updated build strings.
|
2019-11-29 00:01:08 +01:00 |
|
artica
|
ec6d317bd4
|
Auto-updated build strings.
|
2019-11-28 00:01:09 +01:00 |
Daniel Barbero Martin
|
e6afe84940
|
Fixed pdf
|
2019-11-27 15:22:39 +01:00 |
Luis
|
b0d5b7223e
|
Added report template regex to MR
|
2019-11-27 13:21:05 +01:00 |
|
Daniel Barbero Martin
|
ea2c5bc8c9
|
Fixed translate
|
2019-11-27 11:49:20 +01:00 |
Alejandro Fraguas
|
ed0ad76e61
|
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop'
Add new search for id source event in metaconsole
See merge request artica/pandorafms!2438
|
2019-11-27 10:14:35 +01:00 |
|
artica
|
d2fdc0cf9d
|
Auto-updated build strings.
|
2019-11-27 00:01:08 +01:00 |
fbsanchez
|
c28dfd60a5
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-26 16:16:15 +01:00 |
|
Alejandro Fraguas
|
e96d7f1f30
|
Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop'
Added index in MR
See merge request artica/pandorafms!2916
|
2019-11-26 15:37:49 +01:00 |
Daniel Rodriguez
|
66c67ea74a
|
Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop'
Ent 4226 mejoras plugin sap
See merge request artica/pandorafms!2853
|
2019-11-26 14:14:10 +01:00 |
|
fbsanchez
|
c985f2d5f9
|
Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-26 10:50:51 +01:00 |
|
fbsanchez
|
d3f18a94f7
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
|
2019-11-26 10:48:59 +01:00 |
Daniel Maya
|
cf8bae66d1
|
Added index in MR
|
2019-11-26 10:31:57 +01:00 |
|
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
|
Daniel Barbero
|
867f0cfbe9
|
WIP Rules alert correlation
|
2019-11-25 20:06:42 +01:00 |
|
Marcos Alconada
|
d0aab40fa8
|
Update 29.sql
|
2019-11-25 16:56:59 +01:00 |
|
marcos
|
0490024abc
|
add sap view to autorefresh edit my user
|
2019-11-25 15:01:27 +01:00 |
|
marcos
|
6f8bf104b4
|
update sap view
|
2019-11-25 13:50:26 +01:00 |
|
fbsanchez
|
1b4b59d1c2
|
Rules migration DB
|
2019-11-25 13:36:43 +01:00 |
|
fbsanchez
|
1b57b279fb
|
minor changes
|
2019-11-25 13:03:55 +01:00 |
|
fbsanchez
|
a854809247
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
|
2019-11-25 09:39:25 +01:00 |
|
Daniel Barbero
|
f24034e729
|
Add styles Rules
|
2019-11-25 09:09:59 +01:00 |
|
artica
|
1592773b46
|
Auto-updated build strings.
|
2019-11-25 00:01:07 +01:00 |
|
artica
|
44311c0438
|
Auto-updated build strings.
|
2019-11-24 00:01:07 +01:00 |
|
fbsanchez
|
ae5d7b8944
|
minor style fix rulebuilder
|
2019-11-23 13:20:19 +01:00 |
|
fbsanchez
|
9bfe3f3152
|
minor style fix rulebuilder
|
2019-11-23 13:16:30 +01:00 |
|
fbsanchez
|
d3b5e7a2b0
|
minor style fix rulebuilder
|
2019-11-23 13:13:24 +01:00 |
|
fbsanchez
|
2f0b2c1766
|
minor fix css
|
2019-11-23 13:06:58 +01:00 |
|
fbsanchez
|
64e481187f
|
RuleBuilder Style updates
|
2019-11-23 12:48:47 +01:00 |
|
artica
|
09e6615611
|
Auto-updated build strings.
|
2019-11-23 00:01:09 +01:00 |
|
fbsanchez
|
4e2bd7ed55
|
minor fixes
|
2019-11-22 20:49:46 +01:00 |
|
fbsanchez
|
5423e78d62
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
|
2019-11-22 15:49:07 +01:00 |