tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,417 Commits 34 Branches 30 Tags
Commit Graph

21417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcos.alconada
cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Marcos Alconada
a2c530cccd Merge branch 'develop' into 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' 
# Conflicts:
#   pandora_console/extras/pandora_diag.php
 2019-06-10 12:41:08 +02:00
Alejandro Fraguas
d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop' 
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
 2019-06-10 10:51:26 +02:00
artica
7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica
ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica
0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
fbsanchez
bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez
f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez
d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez
419a90d69c wip event list 2019-06-07 17:35:13 +02:00
Alejandro Fraguas
6edd6ac2dd Merge branch 'ent-3626-referencias-log4x-2' into 'develop' 
Ent 3626 referencias log4x 2

See merge request artica/pandorafms!2488
 2019-06-07 11:34:30 +02:00
marcos.alconada
833248991b Add mr 29 2019-06-07 11:24:00 +02:00
marcos.alconada
1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
marcos.alconada
c0807af57b Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-07 10:25:21 +02:00
Marcos Alconada
f89aefa7ab Merge branch 'revert-928f6a79' into 'develop' 
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"

See merge request artica/pandorafms!2487
 2019-06-07 10:24:27 +02:00
Marcos Alconada
d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada
be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Alejandro Fraguas
021ae9b1cd Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop' 
Ticket Resolved

See merge request artica/pandorafms!2227
 2019-06-07 09:48:51 +02:00
Marcos Alconada
241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" 
This reverts merge request !2282
 2019-06-07 09:35:13 +02:00
Marcos Alconada
928f6a797b Merge branch 'ent-3626-referencias-log4x' into 'develop' 
Resolved ticket with sql sentence

See merge request artica/pandorafms!2282
 2019-06-07 09:34:54 +02:00
marcos.alconada
435a7476c7 Merge branch 'ent-3626-referencias-log4x' into develop 2019-06-07 09:25:04 +02:00
marcos.alconada
a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
artica
2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
marcos.alconada
73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez
23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente
4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Tatiana Llorente
a4ea5e7c77 Added image for unknown and no data status - 4088 2019-06-06 14:16:09 +02:00
Daniel Rodriguez
75872850ce Merge branch 'ent-4153-threads-shared' into 'develop' 
threads-shared returns

See merge request artica/pandorafms!2480
 2019-06-06 13:31:12 +02:00
Alejandro Fraguas
527a9f4a35 Merge branch 'ent-3614-Vista-de-Servicios' into 'develop' 
New styles for Services table view - #3614

See merge request artica/pandorafms!2468
 2019-06-06 12:58:06 +02:00
Tatiana Llorente
2d84081ca7 Add styles for metaconsole - #3614 2019-06-06 12:09:35 +02:00
Tatiana Llorente
334e66aaf1 Export csv from custom field view meta - #3474 2019-06-06 10:39:09 +02:00
artica
034a910000 Auto-updated build strings. 2019-06-06 00:01:07 +02:00
Daniel Rodriguez
bafdfdb810 Merge branch 'ent-3534-7549-parseo-erroneo-de-ip' into 'develop' 
Fix the regexp for IPv4 addresses.

See merge request artica/pandorafms!2474
 2019-06-05 13:26:58 +02:00
Alejandro Fraguas
7883fc5f96 Merge branch 'ent-4121-meta-user-edition-bug' into 'develop' 
Fixed bug in meta user_edir form url

See merge request artica/pandorafms!2472
 2019-06-05 12:00:31 +02:00
Alejandro Fraguas
9791b174b2 Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop' 
Ent 4030 bug en busqueda de inventario

See merge request artica/pandorafms!2431
 2019-06-05 10:23:43 +02:00
artica
95574adf80 Auto-updated build strings. 2019-06-05 00:01:08 +02:00
fbsanchez
5b2eb8891b tab moved 2019-06-04 22:43:26 +02:00
fbsanchez
6ed2a0636e styles review 2019-06-04 22:34:17 +02:00
fbsanchez
b14cdfb4c2 minor fix in tactical 2019-06-04 22:22:33 +02:00
fbsanchez
a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
Daniel Rodriguez
537a73be04 Merge branch 'ent-4131-error-migrate-6-a-7' into 'develop' 
Added missing create table to migrate 6 to 7

See merge request artica/pandorafms!2477
 2019-06-04 18:26:12 +02:00
Tatiana Llorente
1a8b09229c Export csv from custom field view meta - #3474 2019-06-04 17:28:55 +02:00
Daniel Rodriguez
5d961c1485 Merge branch 'ent-3187-snmp-browser-no-muestra-datos-v3' into 'develop' 
Unified SNMP version 3 code.

See merge request artica/pandorafms!2471
 2019-06-04 16:40:41 +02:00
Alejandro Fraguas
a1591f7a84 Merge branch 'ent-3362-7334-Bug-time-comparison-graficas-de-modulos' into 'develop' 
Fixed bug in time comparison graphs

See merge request artica/pandorafms!2476
 2019-06-04 16:29:52 +02:00
Ramon Novoa
51f57e9247 Fix a typo. 2019-06-04 15:54:32 +02:00
fbsanchez
e1eac631c1 tactical icon sizes 2019-06-04 15:42:27 +02:00
fbsanchez
b7c14d49fd threads-shared returns 2019-06-04 15:10:05 +02:00
fbsanchez
2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez
c741020538 styles review 2019-06-04 13:57:55 +02:00
Daniel Rodriguez
b2b3d748c1 Merge branch 'ent-3901-Macro-event-id-no-funciona-en-meta-si-el-evento-tiene-server-id-0' into 'develop' 
allow fetching of event id in metaconsole event table when getting target of an…

See merge request artica/pandorafms!2437
 2019-06-04 12:45:26 +02:00