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

17573 Commits

Author SHA1 Message Date
Daniel Rodriguez
19579c0801 Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop' 
Ent 7505 11819 bug en widget tree view

See merge request artica/pandorafms!4125
 2021-06-21 13:58:57 +00:00
Luis
ebceaebb58 Ent 7253 opcion formato envio informes templates 2021-06-21 13:41:14 +00:00
Daniel Rodriguez
6f98ae05a1 Merge branch 'ent-7038-regex-agent-filter-generacion-informe-tasks' into 'develop' 
Added agent regex to console task template send email

Closes pandora_enterprise#7038

See merge request artica/pandorafms!4135
 2021-06-21 10:21:48 +00:00
Daniel Rodriguez
c5dab9b99b Merge branch 'ent-7488-pantallazo-blanco-config.php-installer-activo' into 'develop' 
Ent 7488 pantallazo blanco config.php installer activo

See merge request artica/pandorafms!4106
 2021-06-21 10:17:12 +00:00
Luis
10059822cd Ent 7488 pantallazo blanco config.php installer activo 2021-06-21 10:17:12 +00:00
fbsanchez
fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
marcos
5aeab363e9 more size for select owner modal events 2021-06-21 11:25:19 +02:00
Daniel Rodriguez
f5221083b1 Merge branch 'ent-7244-Errores-network-tools' into 'develop' 
Solved issues with double quotes and improve the code

Closes pandora_enterprise#7244

See merge request artica/pandorafms!4101
 2021-06-21 09:13:35 +00:00
Daniel Rodriguez
95a152752b Merge branch 'ent-7555-11820-Filtro-de-eventos-en-widget-Lastest-events' into 'develop' 
Ent 7555 11820 filtro de eventos en widget lastest events

See merge request artica/pandorafms!4142
 2021-06-21 09:10:45 +00:00
artica
447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica
dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica
682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
fbsanchez
1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos
36dd93701a Merge remote-tracking branch 'origin/develop' into ent-5023-limpiar-toda-referencia-a-event-alert 2021-06-18 12:28:58 +02:00
Daniel Barbero Martin
1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica
0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Daniel Barbero Martin
6366040ec2 Wip command center, check versions php.ini 2021-06-17 17:09:44 +02:00
fbsanchez
1401f30e84 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-17 14:49:25 +02:00
Daniel Barbero Martin
50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica
e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
fbsanchez
ae448e6eb8 Some fixes 2021-06-16 20:34:29 +02:00
fbsanchez
d2710b2e66 Clean components when removing plugin (server) 2021-06-16 19:39:25 +02:00
Daniel Barbero Martin
452d5d0b73 Wip command center, error merge 2021-06-16 19:37:09 +02:00
fbsanchez
81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
fbsanchez
b032beb559 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-16 17:27:06 +02:00
Daniel Barbero Martin
c6877154fb Wip command center, Plugins in meta 2021-06-16 17:26:19 +02:00
José González
09d5657650 Solve typo 2021-06-16 16:36:14 +02:00
Calvo
06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02:00
fbsanchez
b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
José González
00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
marcos
493047ae40 fixed visual error 2021-06-16 14:17:45 +02:00
fbsanchez
9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
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 Barbero Martin
64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
alejandro.campos@artica.es
e8b62561b7 fixed entities 2021-06-15 14:53:00 +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
Daniel Barbero Martin
f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
artica
2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +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
fbsanchez
4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +02:00
Daniel Rodriguez
08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +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
marcos
0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
José González
e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +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
José González
b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00