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

20392 Commits

Author SHA1 Message Date
fbsanchez 45c9f6d51c Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
 2019-04-12 19:24:27 +02:00
Daniel Rodriguez 9da83faade Merge branch 'ent-3806-Nuevo_mapa_Edicion_usuario' into 'develop' 
add map user edit

See merge request artica/pandorafms!2349

Former-commit-id: 921eb0faff704e17f26024ab2add32f53e151df7
 2019-04-12 13:11:27 +02:00
Daniel Rodriguez a792128906 Merge branch 'ent-3522-Conservar-perfiles-de-usuarios-standard-en-caso-de-cambio-LDAP/AD' into 'develop' 
Added token save profile user

See merge request artica/pandorafms!2343

Former-commit-id: f6558be197626904837589df0a7559df60b2ef3e
 2019-04-12 12:53:20 +02:00
Daniel Barbero Martin 26d5060232 fixed errors css 
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
 2019-04-12 10:10:04 +02:00
manuel 61552bc201 Fixed ldap login 
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
 2019-04-12 10:03:18 +02:00
Tatiana Llorente 59c2734b5a Deleted old files. Centered the map. Fixed broken image in meta. - #3806 
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
 2019-04-12 09:20:55 +02:00
artica f5088299f3 Auto-updated build strings. 
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
 2019-04-12 00:01:24 +02:00
fbsanchez e80649073f Minor fixes 
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
 2019-04-11 15:36:55 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
 2019-04-11 15:12:46 +02:00
fbsanchez e998c8dd70 Discovery RDS 
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
 2019-04-11 15:05:03 +02:00
artica 29e1fc828c Auto-updated build strings. 
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
 2019-04-11 00:01:30 +02:00
fbsanchez 2af9cbb711 Discovery RDS Bypass perl thread ENV limitation 
Former-commit-id: 34ca5374e66c174887683077ba5efcae5412b9bb
 2019-04-10 23:16:18 +02:00
fbsanchez 834d5d6c50 WIP:Discovery RDS 
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
 2019-04-10 20:40:03 +02:00
manuel 0f78d87504 Fixed bug in save profile users 
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
 2019-04-10 16:12:22 +02:00
Daniel Rodriguez 4ab7f2c56f Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' into 'develop' 
Ent 3791 7780 cron en modulos no funcionan bien

See merge request artica/pandorafms!2337

Former-commit-id: 2d7e13817fee6c23d271405d48198ab069357e2b
 2019-04-10 10:20:35 +02:00
artica 765ca945a0 Auto-updated build strings. 
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
 2019-04-10 00:01:25 +02:00
fbsanchez e59ce5412c WIP Discovery RDS 
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
 2019-04-09 18:33:02 +02:00
Daniel Barbero Martin 0769c61b19 add map user edit 
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
 2019-04-09 18:18:10 +02:00
manuel 1efedd26ce Fixed bug in LDAP authentication 
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
 2019-04-09 13:39:30 +02:00
Daniel Rodriguez 5494a6129f Merge branch 'ent-3855-Problemas_grupos_secundarios_en_input_auto_completado_de_modulos' into 'develop' 
fixed error autocomplete input module

See merge request artica/pandorafms!2345

Former-commit-id: 76a7c4aa1d611a21b307d0d6367a1f15dc40b323
 2019-04-09 13:14:38 +02:00
Daniel Rodriguez c313629080 Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop' 
flip flop keep counters

See merge request artica/pandorafms!2308

Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
 2019-04-09 12:04:54 +02:00
Alejandro Fraguas 351b7218ee Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop' 
Removed unnecesary io_safe_inpunt on   from functions_api.php

See merge request artica/pandorafms!2256

Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
 2019-04-09 11:19:10 +02:00
Daniel Barbero Martin 6585a4736b fixed minor error local companent with keep counters 
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
 2019-04-09 10:19:51 +02:00
Daniel Barbero Martin 8404450458 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
 2019-04-09 09:53:31 +02:00
Daniel Barbero Martin 3e4a7bfdbf fixed error autocomplete input module 
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
 2019-04-09 09:51:03 +02:00
artica 0d05d5c842 Auto-updated build strings. 
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
 2019-04-09 00:01:31 +02:00
Daniel Barbero Martin d5b1ac5565 fixed map IPAM 
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
 2019-04-08 18:28:27 +02:00
fbsanchez 79bd37ee5b Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
 2019-04-08 16:28:26 +02:00
fbsanchez 54bd3bf089 Discovery F3 
Former-commit-id: 1990149c5f5795f825bc337fd7ae29d360348d45
 2019-04-08 16:23:32 +02:00
manuel db13ecbb39 Added token save profile user 
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
 2019-04-08 11:55:58 +02:00
artica 9fd5d3bf5a Auto-updated build strings. 
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
 2019-04-08 00:01:23 +02:00
artica d35e9dbaae Auto-updated build strings. 
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
 2019-04-07 00:01:25 +02:00
artica 1ddb5ebff4 Auto-updated build strings. 
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
 2019-04-06 00:01:32 +02:00
fbsanchez 8e00fdebb4 Merge branch 'ent-3674-discovery-fase-3' of brutus.artica.lan:artica/pandorafms into ent-3674-discovery-fase-3 
Former-commit-id: 755d2013c4f25475eb4f38dec9a8974c74f08715
 2019-04-05 17:20:50 +02:00
fbsanchez b9db5fdb6f wip discovery f3 
Former-commit-id: 6b9f5bc3995a16414e1c1a9201983f33eb6908ad
 2019-04-05 17:20:45 +02:00
Daniel Barbero 49d925d96a Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Conflicts:
	pandora_console/extras/mr/27.sql


Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
 2019-04-05 16:48:58 +02:00
Daniel Barbero 4808e4ae97 fixed errors map ipam 
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
 2019-04-05 16:43:36 +02:00
Daniel Rodriguez a480e4c73f Merge branch 'ent-3740-Buguillo-en-configuracion-de-ACLs' into 'develop' 
ent 3740 buguillo en configuracion de ac ls

See merge request artica/pandorafms!2281

Former-commit-id: 92349a3f4e6b9820606395d06964e64cdecbba9f
 2019-04-05 13:17:30 +02:00
fermin831 ae3c461da6 Fixed problems with inverse cron intervals in Windows agent 
Former-commit-id: 0573c83dd346ef9076504688071d4678e554a6d5
 2019-04-05 13:09:12 +02:00
Daniel Rodriguez 781a6702ad Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop' 
Custom fields in availability report type

See merge request artica/pandorafms!2324

Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
 2019-04-05 13:01:09 +02:00
fermin831 873525726e Avoid infinite loops when the day of the week in cron is out of limits 
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
 2019-04-05 12:32:43 +02:00
fermin831 e50fb4c585 Fixed cron day of the week on linux agents 
Former-commit-id: 2e920e1a3387d0a42dcd67eec1fbd0e0a08d998d
 2019-04-05 12:00:43 +02:00
fbsanchez 970a10ba50 fixes in non agent per database 
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
 2019-04-05 10:41:37 +02:00
fbsanchez db9068e25a fixes in non agent per database 
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
 2019-04-05 10:41:09 +02:00
Daniel Barbero 447655409d fixed minor error keep counters local and network components 
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
 2019-04-05 09:27:46 +02:00
Manuel Montes 6bd38c6d4c Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs' 
Conflicts:
   pandora_console/include/functions_menu.php

Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
 2019-04-05 08:15:48 +02:00
artica 8d0e53924d Auto-updated build strings. 
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
 2019-04-05 00:01:32 +02:00
fbsanchez e76a5af441 minor fix parent link 
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
 2019-04-04 18:20:26 +02:00
Luis Calvo 33db6d2f0c If is metaconsole, param meta is setted to true 
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
 2019-04-04 18:13:29 +02:00
Daniel Rodriguez c52b30fd7e Merge branch 'ent-3784-error-creating-alert-actions-api' into 'develop' 
Insert zero into fires_min an fires_max when null

See merge request artica/pandorafms!2318

Former-commit-id: b7d8c6738530e1d842be34ad7f81c31a898d1c76
 2019-04-04 18:03:53 +02:00