Commit Graph

5608 Commits

Author SHA1 Message Date
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop'
several fixes in netscan custom

See merge request artica/pandorafms!3736
2021-01-25 09:50:27 +01:00
Daniel Rodriguez 619574269b Merge branch 'ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos' into 'develop'
Fix capitalization issues in wmi windows env

See merge request artica/pandorafms!3677
2021-01-25 09:28:44 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
Jose Gonzalez 5283771e32 Solved issue with verbosity parameters 2021-01-21 13:33:14 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
Jose Gonzalez a5d39365f8 Added feature for fix discovery tasks with server down 2021-01-20 17:56:39 +01:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
Jose Gonzalez c760a937ae Solved issue 2021-01-19 16:10:46 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
fbsanchez 6f228fa2dd Merge remote-tracking branch 'origin/develop' into ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos 2021-01-18 10:52:06 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 79d6c8fb59 Merge branch 'ent-6670-POST-Prioridad-incorrecta-en-el-contenido-de-las-alertas-SNMP' into 'develop'
changed action/alert priority of fields for snmp alerts

See merge request artica/pandorafms!3595
2021-01-11 18:09:58 +01:00
Daniel Rodriguez d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop'
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
2021-01-11 09:30:56 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez 1f7a68cacc Added group_password to print_agent 2021-01-07 16:37:13 +01:00
fbsanchez 3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop'
added additional check for token

See merge request artica/pandorafms!3757
2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es 84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez 60f43dadb9 Merge branch 'ent-6719-mensaje-error-server-open' into 'develop'
Fix error

Closes pandora_enterprise#6719

See merge request artica/pandorafms!3623
2020-12-23 17:05:38 +01:00
Daniel Rodriguez 1324725263 Merge branch 'ent-6856-Warning-feo-server' into 'develop'
Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
2020-12-23 16:06:24 +01:00
Daniel Rodriguez ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop'
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
2020-12-23 16:04:53 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
artica 1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
artica da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica 42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica 37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
fbsanchez bc3616e6c5 visual console mobile wip 2020-12-18 13:40:00 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica 87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
artica 2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
Jose Gonzalez 430457b30a Deleted logstash references 2020-12-15 13:12:00 +01:00
Rafael c06940c181 add fping as dependencie for pandora server open rpms 2020-12-15 12:57:48 +01:00
Jose Gonzalez 397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
Jose Gonzalez 13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
artica fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Luis Calvo c4eb3dd088 Added log on deleting tgraph_source data in pandora_db 2020-12-14 10:52:12 +01:00
artica f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica 37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica 85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00
artica 223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
artica acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
Daniel Rodriguez a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
fbsanchez 340c3026c2 Fix capitalization issues in wmi windows env 2020-12-01 12:36:24 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez b1d2e7bba0 Merge branch 'ent-5572-9625-añadir-configuración-periodo-de-silencio-trap-storm-protection' into 'develop'
Ent 5572 9625 añadir configuración periodo de silencio trap storm protection

See merge request artica/pandorafms!3580
2020-11-30 14:26:23 +01:00
fbsanchez 0eab0c3a18 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows 2020-11-30 10:06:04 +01:00
fbsanchez 3f8123e879 Merge remote-tracking branch 'origin/develop' into ent-6787-plugin-server-timeout-no-funciona-correctamente 2020-11-30 10:05:19 +01:00
artica 863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica 9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica 66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
fbsanchez f4c17087c5 minor fixes in pluginserver 2020-11-27 13:54:58 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
artica 935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
fbsanchez 7e61465955 Avoid erase ALL sessions from tsessions_php (pandora_db) 2020-11-26 18:27:11 +01:00
Daniel Rodriguez 7cfa10dcbd Merge branch 'ent-6691-cli-delete-group-doesnt-delete-group-name-blankspaces' into 'develop'
Fixed safe input on cli delete_group

See merge request artica/pandorafms!3597
2020-11-26 11:48:35 +01:00
artica f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Daniel Rodriguez b2fb9898f2 Merge branch 'ent-4868-poner-la-version-de-producto-en-pandora_ha-anda' into 'develop'
Export product VERSION from Tools.pm

See merge request artica/pandorafms!3641
2020-11-25 18:40:07 +01:00
artica b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
fbsanchez 04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
artica 1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
fbsanchez a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
artica 7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica 87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
artica f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
Daniel Rodriguez 1df3c4f595 Merge branch 'ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada' into 'develop'
Avoid host latency "fake" value 0

See merge request artica/pandorafms!3509
2020-11-19 14:51:16 +01:00
artica e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
Jose Gonzalez 31f23a7994 Fix bug with macro fields 2020-11-18 13:16:04 +01:00
fbsanchez 952de36aab Merge remote-tracking branch 'origin/develop' into ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada 2020-11-18 12:02:17 +01:00
artica ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
Jose Gonzalez ef899ef529 Fix error 2020-11-17 15:21:38 +01:00
artica 9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
Daniel Rodriguez 26006fe33b Merge branch 'ent-6493-provisioning-server-autoconfiguracion-de-agentes-no-es-funcional' into 'develop'
Ent 6493 provisioning server autoconfiguracion de agentes no es funcional

See merge request artica/pandorafms!3600
2020-11-16 18:51:08 +01:00
Daniel Maya 55c368f957 fixed last_compact in history db 2020-11-16 17:34:23 +01:00
artica 810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica 26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
artica 6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
artica 834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
artica 33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
fbsanchez edb0ebd508 minor changes 2020-11-10 19:31:14 +01:00
fbsanchez b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
artica 2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica 767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica 4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica 5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
artica 2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
Luis Calvo 64bd9bfc79 Fixed safe input on cli delete_group 2020-11-05 16:14:06 +01:00
Luis Calvo 6337fd3667 Fixed CLI update_group 2020-11-05 14:31:26 +01:00
alejandro-campos d75bb46f34 changed action/alert priority of fields for snmp alerts 2020-11-05 12:47:25 +01:00
artica 6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
Daniel Rodriguez a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -

See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
artica 081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
Daniel Maya c1a7fc2e9a Added snmp_storm_silence_period 2020-10-28 10:57:21 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
artica 3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
fbsanchez 5842235846 Orphan service modules + control require argument select from sql 2020-10-26 13:37:05 +01:00
artica 76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica 89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Maya 7cd56b6f94 Ent 6466 borrado de eventos con pandora db 2020-10-14 11:48:34 +02:00
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
Daniel Rodriguez 1134113cf3 Merge branch 'ent-6468-fallo-plantillas-automaticas-discovery' into 'develop'
OID naming compatibility when starts with "." or not

See merge request artica/pandorafms!3522
2020-10-13 15:48:59 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
fbsanchez 02c4fe30a3 OID naming compatibility when starts with "." or not 2020-10-09 14:50:37 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
Daniel Rodriguez 2b5eb00e6a Merge branch 'ent-6199-error-de-encoding-en-plugintools-pm' into 'develop'
Added encoding lib to prevent errors with PAR Packer

See merge request artica/pandorafms!3391
2020-10-08 15:04:19 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
Daniel Rodriguez 9f4397a760 Merge branch 'ent-6373-10641-eventos-de-going-to-normal-cada-5-minutos' into 'develop'
FF keep counters fix

See merge request artica/pandorafms!3489
2020-10-07 16:04:43 +02:00
Daniel Rodriguez f83737b01f Merge branch 'ent-6433-server-does-not-have-access-to-the-api' into 'develop'
Ent 6433 server does not have access to the api

Closes pandora_enterprise#6433

See merge request artica/pandorafms!3503
2020-10-07 14:55:46 +02:00
fbsanchez ac4904f123 Avoid host latency "fake" value 0 2020-10-07 12:22:46 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
Jose Gonzalez 6459c6aa73 Update the correct file 2020-10-05 15:15:10 +02:00
Jose Gonzalez 0da066954b Modified localhost for 127.0.0.1 for ACL control 2020-10-05 15:12:18 +02:00
Jose Gonzalez e8e20b933c Testing 2020-10-05 12:53:49 +02:00
Jose Gonzalez 50dd166cb3 Testing 2020-10-05 11:48:06 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
fbsanchez 2830af06e9 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows
Conflicts:
	pandora_agents/unix/pandora_agent
2020-10-02 13:28:08 +02:00
fbsanchez da0c8355c9 RC1 Omnishell for windows 2020-10-02 13:21:08 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
Daniel Rodriguez e9ec50c81f Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop'
pandora_db only runs on the master server.

See merge request artica/pandorafms!3477
2020-10-02 12:26:38 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
fbsanchez 0bc2b9ddec RC1 omnishell_caller 2020-10-01 20:07:07 +02:00
fbsanchez 93938e902b Omnishell package 2020-10-01 19:34:05 +02:00
fbsanchez 308598ba8d minor fix 2020-10-01 16:23:00 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00
fbsanchez 182df1c12d WIP omnishell 2020-10-01 10:01:08 +02:00
artica 43b02efa4e Auto-updated build strings. 2020-10-01 01:00:20 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez 8d5e3adf6a WIP Omnishell common libraries 2020-09-30 13:09:48 +02:00