tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-29 13:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,748 Commits 34 Branches 30 Tags
Commit Graph

1687 Commits

Author SHA1 Message Date
Daniel Barbero Martin
900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Daniel Barbero Martin
ea747f25f3 Fix mr pandoradb migrate 2021-11-05 12:29:34 +01:00
José González
bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin
c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
Daniel Barbero Martin
c73ee2d113 updated mr and version 2021-11-03 11:04:19 +01:00
Daniel Barbero Martin
25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez
08d4323941 set deployment_timeout per agent installation file 2021-11-02 17:37:47 +01:00
fbsanchez
a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
Daniel Maya
05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +02:00
fbsanchez
5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez
796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo
a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez
df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez
303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez
bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Calvo
9f71a9ba81 Fix mr 48 breaking tasks 2021-10-18 16:05:37 +02:00
fbsanchez
6c0e2d23de updates 2021-10-15 13:39:23 +02:00
fbsanchez
75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez
6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez
79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +02:00
fbsanchez
96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
Daniel Maya
e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
fbsanchez
d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
fbsanchez
ef42348807 compat mysql 5.1 exceeded key 2021-10-08 16:02:06 +02:00
fbsanchez
fa35e6054c Fixes 2021-10-08 15:30:17 +02:00
fbsanchez
1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
fbsanchez
6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Jose Gonzalez
a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
fbsanchez
b8dc85a0dd wip 2021-10-05 16:42:24 +02:00
fbsanchez
31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
fbsanchez
e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
Jose Gonzalez
6deaee84ac Merge 2021-10-04 10:00:15 +02:00
fbsanchez
be95b5ffd0 updates 2021-10-01 13:56:21 +02:00
alejandro.campos@artica.es
277fcd51ca minor changes 2021-09-30 16:02:14 +02:00
fbsanchez
e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +02:00
fbsanchez
18b1a1e14e Schema update to avoid using JSON columns until internal CICD is updated 2021-09-30 11:18:13 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez
d683e192b5 Moved changes for CorrelationServer schema to MR50 2021-09-29 13:43:08 +02:00
alejandro.campos@artica.es
fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +02:00
fbsanchez
15c2bdf17b WIP NCM 2021-09-28 18:53:22 +02:00
Daniel Rodriguez
894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00
alejandro.campos@artica.es
631edabdf9 added changes to mr 2021-09-24 11:42:40 +02:00
alejandro.campos@artica.es
9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +02:00
Jose Gonzalez
7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
fbsanchez
12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2021-09-23 16:23:38 +02:00
Alejandro Campos
ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
Jose Gonzalez
5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Jose Gonzalez
15ec0f4e4d Fix delete_files 2021-09-22 14:25:44 +02:00