tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 14:58:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
23,632 Commits 34 Branches 30 Tags
Commit Graph

23632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcos.alconada
31ec8933a2 changed duplicated code with id_souce_event field 2019-06-21 12:37:32 +02:00
Marcos Alconada
fb24d9bf86 Update 29.sql 2019-06-21 12:08:31 +02:00
fbsanchez
6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
Marcos Alconada
56a7943a06 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-06-21 11:35:56 +02:00
marcos.alconada
effbf5094f Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-06-21 11:34:49 +02:00
marcos.alconada
3fd12975aa added 2 lines 2019-06-21 11:34:36 +02:00
Marcos Alconada
f1110c6d56 Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' 
# Conflicts:
#   pandora_console/extras/mr/29.sql
 2019-06-21 11:31:01 +02:00
marcos.alconada
1dc826c9ff Added field to tevent_filter (id_source_event) 2019-06-21 11:29:51 +02:00
marcos.alconada
a0c6dc69aa add element id_source_event to filters events 2019-06-21 11:22:06 +02:00
artica
e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +02:00
fbsanchez
7a425e7e96 qa event viewer latest fixes 2019-06-20 21:33:38 +02:00
fbsanchez
526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez
9fa9a346ca Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-20 19:23:39 +02:00
fbsanchez
8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
Alejandro Gallardo Escobar
cd5ad59f56 WIP: VC items movement 2019-06-20 18:19:10 +02:00
Daniel Maya
71ea94eea3 Fixed item save 2019-06-20 16:36:24 +02:00
Daniel Rodriguez
265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez
2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
Alejandro Fraguas
c173f9a58f Merge branch 'ent-4209-bug-vc-grafica-sla-automatica-explota-en-cuanto-se-le-ajustan-un-label' into 'develop' 
Bug en label de  auto sla graph

See merge request artica/pandorafms!2517
 2019-06-20 13:53:07 +02:00
fbsanchez
aa238165d9 events rss 2019-06-20 13:33:37 +02:00
alejandro-campos
13e53e5b10 modified api function for adding agent to policy to make it available on meta 2019-06-20 13:05:19 +02:00
fbsanchez
cfe16ee8c3 minor fixes 2019-06-20 11:46:01 +02:00
Alejandro Fraguas
4660ca286f Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop' 
Ent 4225 no se pueden crear componentes de red en la meta

See merge request artica/pandorafms!2516
 2019-06-20 11:41:21 +02:00
Daniel Maya
e182997308 Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-20 11:40:33 +02:00
Alejandro Gallardo Escobar
7a932aceec Fixed the resizement of a vc item when it has a label 2019-06-20 11:27:08 +02:00
Alejandro Fraguas
57e3c147c8 Merge branch 'ent-3959-eventos-de-validacion-manual-de-alertas' into 'develop' 
Changed message to module name

See merge request artica/pandorafms!2518
 2019-06-20 10:22:15 +02:00
Daniel Maya
e828fd6690 Fixed Advanced Permissions LDAP 2019-06-20 09:49:54 +02:00
Tatiana Llorente
c084adfa27 Add module filter by text -#2094 2019-06-20 09:31:36 +02:00
artica
61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
Daniel Maya
ac8efd2bef delete cache item when updating 2019-06-19 18:00:53 +02:00
marcos.alconada
98eb1acf00 Add name alert to message 2019-06-19 17:55:09 +02:00
Tatiana Llorente
988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
fbsanchez
275261e6b3 wip csv export events 2019-06-19 17:30:32 +02:00
fbsanchez
6b944ead97 minor fix 2019-06-19 17:08:18 +02:00
fbsanchez
44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
marcos.alconada
358c3f6a55 Changed message to module name 2019-06-19 16:04:08 +02:00
Alejandro Gallardo Escobar
08f100d608 Merge remote-tracking branch 'origin/develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-19 15:19:38 +02:00
Alejandro Gallardo Escobar
c87919af94 Bugfix 2019-06-19 15:17:13 +02:00
alejandro-campos
45d544ca5d remove typo error in commit 2019-06-19 15:14:41 +02:00
alejandro-campos
5503abc8e1 fix bug in metaconsoles network component creation 2019-06-19 15:12:17 +02:00
Alejandro Fraguas
9a24c90725 Merge branch 'ent-4134-los-informes-no-funcionan-al-exportar-a-csv-json-ni-xml' into 'develop' 
Remove entities from json reports

See merge request artica/pandorafms!2512
 2019-06-19 14:17:58 +02:00
fbsanchez
524575171a event history viewer 2019-06-19 12:56:16 +02:00
marcos.alconada
174db17a05 remove entities from reports 2019-06-19 12:33:11 +02:00
Daniel Rodriguez
cfaeaa3c9c Merge branch 'ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor' into 'develop' 
Ent 3295 revision comportamiento metaconsola con nodo multi servidor

See merge request artica/pandorafms!2440
 2019-06-19 12:15:14 +02:00
fbsanchez
4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
Rafael Ameijeiras
47fc2d70ad Merge branch 'ent-4235-deltete_forgoten_file' into 'develop' 
Ent 4235  deltete_forgoten_file

See merge request artica/pandorafms!2514
 2019-06-19 10:23:01 +02:00
Rafael Ameijeiras
b428797004 delete_file 2019-06-19 10:12:06 +02:00
fbsanchez
a7f9484adb minor style change 2019-06-19 08:43:37 +02:00
artica
a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
fbsanchez
37e98d108b fit mc 2019-06-18 19:17:21 +02:00