tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,110 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop' 
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
 2023-07-13 07:55:47 +00:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
miguel angel rasteu 8ad4e8261e #10563 Fix config enable feedback 2023-07-03 10:22:22 +02:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
alejandro.campos@artica.es 1499af3a2d added setup token 2023-06-19 11:04:08 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu 80aeaebfad #11266 Add hint 2023-05-31 09:26:42 +02:00
miguel angel rasteu 08a4c28953 #11266 Fix location of console.log 2023-05-31 09:22:16 +02:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Jose Gonzalez 8d7620e88d Setup updates 2023-03-16 13:11:11 +01:00
Jose Gonzalez 21c263c7c4 Setup views 2023-03-16 11:58:35 +01:00
Jose Gonzalez d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
Jonathan ce45469f83 Fix setup visual bugs 2023-02-16 13:16:31 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +01:00
Daniel Cebrian 31acafc00f #10253 Enforcement options in setup visuals and general setup 2023-02-06 09:06:34 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Calvo c8bbf1e2dc Fix minor bug 2023-01-05 08:56:07 +01:00
Calvo 19fe7ffe73 Fix minor bug 2022-12-30 15:04:07 +01:00
Calvo 867749f9d3 Fix inventory blacklist open 2022-12-29 18:14:43 +01:00
Calvo 0e2829eca0 Fix inventory blacklist js 2022-12-28 18:28:03 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Calvo f8b3183ad3 Moved inventory blacklist to open 2022-12-27 13:02:03 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
jose.gonzalez@pandorafms.com c7aa456d60 Adapt views 2022-10-26 10:51:12 +02:00
edu.corral 881e0914f0 ent 9149 password mail validation 2022-09-14 16:20:13 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
Daniel Rodriguez 44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop' 
Email test working with data in text fields

See merge request artica/pandorafms!4090
 2021-05-26 13:30:36 +00:00
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Calvo 6ad371e4ab Email test working with data in text fields 2021-04-29 16:04:51 +02:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
Jose Gonzalez 6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00