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

30028 Commits

Author SHA1 Message Date
Ramon Novoa 8bc84bf0b4 Add a watchdog for Tentacle Server to pandora_ha. 2022-04-13 13:14:54 +02:00
Daniel Rodriguez ea07bba78b Merge branch 'ent-8815-error-500-en-operaciones-masivas-de-modulos-copy' into 'develop' 
Ent 8815 error 500 en operaciones masivas de modulos copy

See merge request artica/pandorafms!4813
 2022-04-12 07:05:39 +00:00
artica acf31f9dfd Auto-updated build strings. 2022-04-12 01:00:51 +02:00
Daniel Maya 51f5127265 #8815 Fixed table 2022-04-11 14:04:57 +02:00
artica 773071946f Auto-updated build strings. 2022-04-11 01:00:21 +02:00
artica 2c87abc4f8 Auto-updated build strings. 2022-04-10 01:00:24 +02:00
artica fbfd97b113 Auto-updated build strings. 2022-04-09 01:00:12 +02:00
Daniel Rodriguez aa21da9e54 Merge branch 'ent-8731-umc-en-vendor-2' into 'develop' 
Swap some stuff in MR becouse some environments had FK in deprecated tables

See merge request artica/pandorafms!4807
 2022-04-08 09:46:29 +00:00
fbsanchez 9406fa2c09 switch order of drops in MR 2022-04-08 11:31:36 +02:00
artica d2787675d2 Auto-updated build strings. 2022-04-08 01:00:51 +02:00
fbsanchez 037bf016fb Swap some stuff in MR becouse some environments had FK in deprecated tables 2022-04-07 17:26:14 +02:00
Daniel Rodriguez bfcb4dad5e Merge branch 'ent-8786-Borrado-de-IPs-en-agente-Delete-selected-items' into 'develop' 
Ent 8786 borrado de i ps en agente delete selected items

See merge request artica/pandorafms!4797
 2022-04-07 13:31:15 +00:00
Daniel Rodriguez 144d65acf9 Merge branch 'ent-8731-umc-en-vendor' into 'develop' 
update_manager_client => vendor

See merge request artica/pandorafms!4782
 2022-04-07 08:12:14 +00:00
fbsanchez 6c63d13a68 fix in title 2022-04-07 09:46:51 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
artica 63c63a2616 Auto-updated build strings. 2022-04-07 01:00:28 +02:00
Daniel Rodriguez 2471bbf1d4 Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop' 
add new report custom render pandora_enterprise#8540

See merge request artica/pandorafms!4793
 2022-04-06 12:16:26 +00:00
Daniel Barbero Martin a0afaa156d add new report custom render pandora_enterprise#8540 2022-04-06 13:49:28 +02:00
artica b96b8b2a57 Updated version and build strings. 2022-04-06 13:12:18 +02:00
Daniel Rodriguez 4a546e07c8 Merge branch 'ent-8799-actualizar-version-mr' into 'develop' 
update version

See merge request artica/pandorafms!4802
 2022-04-06 08:09:39 +00:00
Daniel Barbero Martin 9de7f0564e update version 2022-04-06 09:42:09 +02:00
artica 7cb547dee4 Auto-updated build strings. 2022-04-06 01:00:46 +02:00
Daniel Rodriguez bcb4efe397 Merge branch 'ent-avoid-warnigs-with-php74' into 'develop' 
Fixed some codes to avoid warnings with some php74 environment.

See merge request artica/pandorafms!4795
 2022-04-05 15:17:47 +00:00
Daniel Rodriguez fb6381b789 Merge branch 'ent-improve-check-allowoverride' into 'develop' 
Added support for FreeBSD in checkAllowOverrideEnabled().

See merge request artica/pandorafms!4794
 2022-04-05 15:08:18 +00:00
Daniel Rodriguez fa62f8facc Merge branch 'ent-8541-cambio-funcionamiento-licencia-satelite' into 'develop' 
Ent 8541 cambio funcionamiento licencia satelite

See merge request artica/pandorafms!4792
 2022-04-05 13:44:12 +00:00
Daniel Barbero Martin 6bfde7e903 add new report custom render pandora_enterprise#8540 2022-04-05 13:55:29 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
artica d0f1723789 Auto-updated build strings. 2022-04-05 01:00:47 +02:00
Daniel Maya dcdcbfad88 #8786 Fixed delete address 2022-04-04 17:40:51 +02:00
Daniel Barbero Martin 6351b98777 add new report custom render pandora_enterprise#8540 2022-04-04 14:56:40 +02:00
Daniel Barbero Martin 502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Rodriguez ad957c5a72 Merge branch 'ent-8742-No-se-pueden-crear-nuevos-mapas-GIS' into 'develop' 
Ent 8742 no se pueden crear nuevos mapas gis

See merge request artica/pandorafms!4789
 2022-04-04 10:38:54 +00:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
Junichi Satoh e0d50facf0 Fixed some codes to avoid warnings with some php74 environment. 2022-04-04 16:31:22 +09:00
Junichi Satoh 5fcf3a4009 Added support for FreeBSD in checkAllowOverrideEnabled(). 2022-04-04 16:22:25 +09:00
Daniel Barbero Martin 863e6c887f Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-04 08:17:03 +02:00
artica 8a5875f987 Auto-updated build strings. 2022-04-04 01:00:24 +02:00
artica 774d2a6777 Auto-updated build strings. 2022-04-03 01:00:26 +02:00
artica 8502bf3ae1 Auto-updated build strings. 2022-04-02 01:00:39 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Daniel Barbero Martin 597e527f38 add new report custom render pandora_enterprise#8540 2022-04-01 13:55:18 +02:00
fbsanchez 0ef851ab7f errata fix in mc environment detection UMC 2022-04-01 10:43:57 +02:00
fbsanchez e4c58fcb40 fix in UMC 2022-04-01 10:37:03 +02:00
Daniel Rodriguez 99b8fa0cf6 Merge branch 'ent-8458-heatmap-view' into 'develop' 
Ent 8458 heatmap view

See merge request artica/pandorafms!4695
 2022-04-01 07:46:25 +00:00
Daniel Rodriguez a4bce4aa7a Merge branch 'ent-8739-12903-Graficas-real-time-dan-error-500-php-8' into 'develop' 
Ent 8739 12903 graficas real time dan error 500 php 8

See merge request artica/pandorafms!4790
 2022-04-01 07:23:25 +00:00
Daniel Barbero Martin bfa137aa67 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-01 09:02:30 +02:00
artica 4218413b82 Auto-updated build strings. 2022-04-01 01:00:40 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Daniel Maya 55e847a5c9 #8541 Added file customer_key 2022-03-31 16:52:50 +02:00