tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-20 09:18:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,072 Commits 34 Branches 30 Tags
Commit Graph

4619 Commits

Author SHA1 Message Date
Daniel Barbero Martin
841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica
90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Maya
38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
Daniel Rodriguez
9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
fbsanchez
c009451d62 Fulfill all variables FX from SNMPTRAP alerts 2021-06-15 13:06:23 +02:00
Daniel Barbero Martin
9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica
2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez
7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez
94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
Daniel Rodriguez
42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop' 
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
 2021-06-14 11:39:41 +00:00
Daniel Barbero Martin
a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica
595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica
e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica
8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
fbsanchez
86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
Daniel Barbero Martin
75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica
876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
fbsanchez
f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
artica
ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Barbero Martin
9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica
5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Barbero Martin
e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica
2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Daniel Rodriguez
4fa8e5cf29 Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop' 
Fixed macro address on network server modules

See merge request artica/pandorafms!4170
 2021-06-08 10:53:15 +00:00
Luis
72cb359133 Fixed macro address on network server modules 2021-06-08 10:53:15 +00:00
Daniel Barbero Martin
df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica
a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
alejandro.campos@artica.es
eb87406e58 fixed bug in unknown alerts 2021-06-07 15:22:20 +02:00
Daniel Barbero Martin
8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica
bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica
656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica
2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin
ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica
8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin
030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica
e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin
18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica
2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin
ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica
b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin
33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica
ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica
20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica
ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin
8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica
059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
Daniel Barbero Martin
a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica
9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00