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

4519 Commits

Author SHA1 Message Date
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez 487ff53825 Min. fields lenght headers 2019-05-29 12:09:45 +02:00
Daniel Rodriguez ee7cd68d39 Merge branch 'ent-1668-update-manager' into 'develop' 
UM register, UM newsletter flow improved

See merge request artica/pandorafms!2463
 2019-05-29 11:55:34 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
Alejandro Fraguas c0763b86d2 Merge branch 'ent-3924-eHorus-settings' into 'develop' 
Ent 3924 e horus settings

See merge request artica/pandorafms!2417
 2019-05-29 10:51:59 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
fbsanchez 5e3ca1664f UM unregister restriction, only admins 2019-05-29 10:37:02 +02:00
fbsanchez 4a60dbe415 Unregistration form 2019-05-29 10:27:28 +02:00
fbsanchez 28555e09de Unregistration form 2019-05-29 10:26:53 +02:00
Daniel Rodriguez 9096444f8f Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop' 
Do not add disabled modules to the execution queue.

See merge request artica/pandorafms!2456
 2019-05-29 09:53:38 +02:00
Daniel Barbero Martin c35cb56699 fixed errors 2019-05-29 08:50:46 +02:00
Alejandro Gallardo Escobar f5d5cbf5b8 VC item cache improvements. 
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
 2019-05-28 18:34:07 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Daniel Barbero Martin 3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez 92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
Daniel Rodriguez 61d3720787 Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop' 
Removed empty help icons in modules

See merge request artica/pandorafms!2454
 2019-05-27 17:53:06 +02:00
manuel 513a74d120 Removed empty help icons in local components 2019-05-27 17:13:25 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +02:00
Daniel Barbero Martin bc64589046 fixed error create modules 2019-05-27 15:27:46 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez 7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
manuel bf3ac73feb Removed empty help icons 2019-05-24 14:26:28 +02:00
manuel 0ee2ed6f5e Removed empty help icons in modules 2019-05-24 12:59:25 +02:00
manuel 0319e4d4e6 Removed empty help icons 2019-05-24 11:11:30 +02:00
Alejandro Fraguas f5586d7b70 Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop' 
fixed label reports and more fixed

See merge request artica/pandorafms!2413
 2019-05-24 10:47:15 +02:00
Daniel Barbero Martin 1386a44e07 fixed errors label report 2019-05-23 17:52:28 +02:00
Daniel Rodriguez 51f846af05 Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop' 
Fixed visual bug in policies operations actions

See merge request artica/pandorafms!2369
 2019-05-23 17:24:59 +02:00
Daniel Rodriguez 7c236149b0 Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop' 
Fixed bug in items reports deleted

See merge request artica/pandorafms!2208
 2019-05-23 17:18:00 +02:00
Alejandro Fraguas 7097481cca Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop' 
fixed bug in macros of plugin modules

See merge request artica/pandorafms!2442
 2019-05-23 17:08:34 +02:00
fbsanchez 1529a04507 Merge branch 'ent-1668-update-manager' into 'develop' 
fixed: um url relative

See merge request artica/pandorafms!2444
 2019-05-23 11:33:46 +02:00
fbsanchez 0ee42fbafe fixed: um url relative 2019-05-23 11:23:42 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
fbsanchez dd8af874fa Merge branch 'ent-1668-update-manager' into 'develop' 
license forms sync MC-N

See merge request artica/pandorafms!2441
 2019-05-23 10:36:43 +02:00
fbsanchez 7b5ae40868 multiple fixes 2019-05-23 10:27:50 +02:00
alejandro-campos 0728c73844 fixed bug in macros of plugin modules 2019-05-22 19:14:01 +02:00
fbsanchez 2cfe4378c2 license forms sync MC-N 2019-05-22 18:50:51 +02:00
Daniel Rodriguez dfb7067db2 Merge branch 'ent-1668-update-manager' into 'develop' 
minor fix MC environments

See merge request artica/pandorafms!2439
 2019-05-22 16:54:33 +02:00
fbsanchez 86cb526893 minor fix MC environments 2019-05-22 15:40:17 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Daniel Rodriguez f6171de522 Merge branch 'ent-3468-Ayudas_online' into 'develop' 
helpers

See merge request artica/pandorafms!2381
 2019-05-21 17:28:27 +02:00
Alejandro Fraguas ce359bfaf6 Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop' 
Ent 3937 eliminar echos y prints de las subclases de wizard

See merge request artica/pandorafms!2430
 2019-05-21 12:11:53 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
fbsanchez 77fc1abe89 minor style updates and fixes in safe-output 2019-05-20 18:16:21 +02:00
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
alejandro-campos 0046e209fe lint changes 2019-05-17 14:46:19 +02:00
alejandro-campos e746a49158 lint changes 2019-05-17 14:26:44 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
Daniel Rodriguez 833c2d91a7 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2426
 2019-05-17 11:27:57 +02:00
Luis Calvo 0cd60d0431 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
 2019-05-16 18:11:33 +02:00
Daniel Maya f1705af9f6 Fixed error window in visual console 
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
 2019-05-16 16:04:38 +02:00
fbsanchez c40e0ec702 pandora_console/extras/delete_files/delete_files.txt 
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
 2019-05-16 15:38:51 +02:00
Luis Calvo 0f35923073 Recovered event criticity field from event alert 
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
 2019-05-16 13:23:47 +02:00
fbsanchez 3cdbfd3646 minor fix in php requirements 
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
 2019-05-16 12:50:16 +02:00
Daniel Rodriguez 0173c856af Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop' 
Changed simple quote in alerts

See merge request artica/pandorafms!2419

Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
 2019-05-16 12:17:22 +02:00
marcos.alconada 8f2dce439b Add javascript for insert name to reports 
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
 2019-05-16 12:13:58 +02:00
fbsanchez e7dbb55392 Minor fixes 
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
 2019-05-16 12:00:49 +02:00
alejandro-campos 13b32003b3 save changes ticket 3937 
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
 2019-05-16 11:37:48 +02:00
Luis Calvo 702926cf85 solved merge conflict mr 28.sql 
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
 2019-05-16 10:15:46 +02:00
fbsanchez d871b599ef General fixes and UM comm updates 
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
 2019-05-14 23:49:01 +02:00
marcos.alconada 0e99b750b4 New branch without trash files 
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
 2019-05-14 18:15:23 +02:00
Daniel Rodriguez be20163073 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2421

Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
 2019-05-14 17:38:55 +02:00
marcos.alconada ff8abf9b40 updated function for show and hide ehorus form 
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
 2019-05-14 15:34:22 +02:00
fbsanchez 6e35f6aec7 UM updates and fixes 
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
 2019-05-14 13:41:21 +02:00
Daniel Barbero Martin 79701bba60 Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA 
Conflicts:
	pandora_console/extras/mr/28.sql


Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
 2019-05-14 12:34:40 +02:00
Daniel Barbero Martin ae11ea18c9 Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas 
Conflicts:
	pandora_console/include/functions_graph.php


Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
 2019-05-14 12:27:02 +02:00
manuel b89751e647 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php


Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
 2019-05-14 11:50:07 +02:00
manuel 421e6b559d Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
 2019-05-14 11:46:39 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts 
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
 2019-05-14 11:11:27 +02:00
manuel 4497554b37 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
 2019-05-14 10:40:49 +02:00
Luis Calvo 8c1c337522 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
 2019-05-13 17:36:32 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
Daniel Rodriguez a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop' 
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
 2019-05-13 16:51:34 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
root 2f2385c9cb Merge remote-tracking branch 'remotes/origin/ent-3611-Vista-Creación-Edición-de-Agente' into develop 
Former-commit-id: bcd067e3b702c3eaa60fff2aeae7e39625f565ef
 2019-05-13 15:57:19 +02:00
Tatiana Llorente b6e8578d1d Fixed a minor sintax error - #3611 
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
 2019-05-13 15:54:06 +02:00
Luis Calvo 14717a6c6d Fixed merge conflict 
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
 2019-05-13 15:15:14 +02:00
Tatiana Llorente e6fa42ddca Fixed a minor bug in remote config - #3611 
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
 2019-05-13 15:02:13 +02:00
Luis Calvo 895588ebe0 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
 2019-05-13 15:00:35 +02:00
Luis Calvo 27096276ec agent view user acces ehorus 
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
 2019-05-13 15:00:29 +02:00
Tatiana Llorente e9082c5d8a Fixed a minor bug in remote config - #3611 
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
 2019-05-13 14:55:15 +02:00
Daniel Rodriguez ecacf2d3f5 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2403

Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
 2019-05-13 14:54:25 +02:00
Daniel Rodriguez f281dda622 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2412

Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
 2019-05-13 14:52:17 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
 2019-05-13 13:17:17 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
marcos.alconada b51cdb93df arreglo con la vista del formulario 
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
 2019-05-10 15:00:21 +02:00