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

3521 Commits

Author SHA1 Message Date
Luis Calvo 77dbb53db4 Fixed minor bug 2019-05-28 18:03:40 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
Tatiana Llorente d68bb176cf Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-05-28 15:56:16 +02:00
fbsanchez c57949079b RC1 agent view 2019-05-28 13:32:17 +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 2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +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 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +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
fbsanchez 1d403ec2f8 SNMP Browser fix 2019-05-24 13:42:49 +02:00
fbsanchez 4400d9303f subscription manager udp 2019-05-23 19:22:05 +02:00
fbsanchez 211b05c9d6 minor fix in newsletter logic 2019-05-23 18:59:38 +02:00
fbsanchez 058c9d3806 Newsletter reminder settings ent 2019-05-23 18:54:04 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Alejandro Fraguas 88234503c0 Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop' 
Fixed url in user_edit

See merge request artica/pandorafms!2436
 2019-05-22 14:14:15 +02:00
Alejandro Fraguas 5b286b4f67 Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop' 
Mejorar la actualizacion de los datos y elementos de la consola visual

See merge request artica/pandorafms!2429
 2019-05-22 13:06:18 +02:00
Daniel Maya edbde3fecb Fixed url in user_edit 2019-05-21 17:14:29 +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
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
Alejandro Gallardo Escobar 2c8dd3b5e5 Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual 2019-05-17 14:16:23 +02:00
Alejandro Gallardo Escobar 34218fa7eb Improved the management of the async requests of the visual console client 2019-05-17 14:09:30 +02:00
Luis Calvo a0faffe161 Form eHorus user login with title 
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
 2019-05-16 18:59:17 +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 b508e40a73 Changed simple quote in alerts 
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
 2019-05-14 11:11:27 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +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
Luis Calvo 27096276ec agent view user acces ehorus 
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
 2019-05-13 15:00:29 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
Luis Calvo 44b14debdc Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
 2019-05-10 09:38:31 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
Daniel Rodriguez 3e91207186 Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop' 
Ent 3617 gráfica de módulos

See merge request artica/pandorafms!2407

Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
 2019-05-09 17:03:03 +02:00
Tatiana Llorente fd83540ad5 New menu module graph for interface modules- #3617 2019-05-09 12:39:03 +02:00
Alejandro Fraguas 0aa8bcda30 Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop' 
Pending to review

See merge request artica/pandorafms!2295
 2019-05-09 11:56:29 +02:00
Tatiana Llorente ef45fc3ca6 Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos 2019-05-09 10:44:31 +02:00
Daniel Rodriguez 0a7539cc3a Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop' 
fixed filemanager

See merge request artica/pandorafms!2408
 2019-05-08 18:26:23 +02:00
marcos.alconada 0b118f63ad Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola 2019-05-08 15:19:40 +02:00
Daniel Rodriguez 0c8fab6cb3 Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop' 
Ent 3574 7598 bug botones y casillas vista de eventos

See merge request artica/pandorafms!2222
 2019-05-08 13:52:45 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Tatiana Llorente cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
Luis Calvo 3221bcf55a Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug 2019-05-07 16:08:29 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Ramon Novoa 10fd9c4b57 Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop 2019-05-07 15:02:47 +02:00
alejandro-campos a622dcc9d4 add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node 
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
 2019-05-06 15:06:26 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop' 
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
 2019-05-06 10:33:30 +02:00
alejandro-campos bcbcd763a1 fixed double load of events in event list 
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
 2019-04-29 15:04:14 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Daniel Maya a5379be0d9 Added refr in full screen and public visual console 
Former-commit-id: 348ec996173e95dce73e5800ece9c6861219c7af
 2019-04-29 12:09:40 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
 2019-04-24 17:05:20 +02:00
Daniel Barbero Martin 62b30c6e91 Merge remote-tracking branch 'origin/develop' into ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado 
Former-commit-id: e51d5accb228485a309abae06d2a68352ae18a9b
 2019-04-24 15:25:06 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
Alejandro Fraguas 759a533180 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop' 
Commit para revisar progreso

See merge request artica/pandorafms!2289

Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
 2019-04-24 13:47:15 +02:00
Alejandro Fraguas a6df522df7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_2' into 'develop' 
Fixed header missing in table alert status - #3707

See merge request artica/pandorafms!2365

Former-commit-id: e56a9610bc358898b5dc61a7f47d32561c72e36b
 2019-04-22 17:31:49 +02:00
Alejandro Gallardo Escobar a03245a277 Visual Console Refactor: fixed the visual console background on the meta 
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
 2019-04-22 09:40:08 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
 2019-04-22 09:01:24 +02:00
marcos.alconada fb87b97cd4 Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola 
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
 2019-04-17 15:12:56 +02:00
Alejandro Gallardo Escobar 0911a00fe9 Visual Console Refactor: fixes 
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
 2019-04-17 13:50:53 +02:00
Tatiana Llorente aa34cf17be Fixed header missing in table alert status - #3707 
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
 2019-04-17 12:57:45 +02:00
Alejandro Gallardo Escobar cbf921ba25 Visual Console Refactor: bugfixes 
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
 2019-04-17 12:32:08 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' 
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
 2019-04-17 10:19:42 +02:00
Alejandro Gallardo Escobar 998a66f654 Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client 
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
 2019-04-16 12:23:03 +02:00
fbsanchez 6648e0268a removed reconview link from menu 
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
 2019-04-15 12:54:22 +02:00
Alejandro Gallardo Escobar 2bd88e858d Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
 2019-04-12 14:28:20 +02:00
Alejandro Gallardo Escobar 2bf49e43cc Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor 
Former-commit-id: c409495771d58549575f68c52da38d2510f4f653
 2019-04-12 14:24:49 +02:00
Alejandro Gallardo Escobar a82143d72b Visual Console Refactor: improved the refresh management 
Former-commit-id: d69eccbb2e06dfe70823d1bb1485f349a23089fe
 2019-04-12 14:23:33 +02:00
Daniel Barbero Martin 3ae6423fc9 Add ACL for item vc 
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
 2019-04-12 13:59:19 +02:00
Alejandro Gallardo Escobar e6741067ff Visual Console Refactor: fixed the tab links from the main view 
Former-commit-id: e3993cedba972d4c163f2eec7228f8748a137cec
 2019-04-12 13:23:38 +02:00
Alejandro Gallardo Escobar 0fe9c57e51 Visual Console Refactor: now the public view is updated on VC update 
Former-commit-id: 9382876893e56f893d92636742905e171766b060
 2019-04-12 13:17:33 +02:00
Alejandro Gallardo Escobar 75d0e11dac Visual Console Refactor: fixed some image urls to load them from the public view 
Former-commit-id: 833a5529304b343ac22a0d054ced47d48667c306
 2019-04-12 13:03:10 +02:00
Alejandro Gallardo Escobar 3cda4523b4 Visual Console Refactor: now the rest of the view changes when the VC is udpated 
Former-commit-id: c2972fa2b6a9177e6ce46efd36e122033fb109c4
 2019-04-12 12:44:45 +02:00
marcos.alconada ddfd3339ff add api 
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
 2019-04-12 11:39:34 +02:00
Daniel Barbero Martin 26d5060232 fixed errors css 
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
 2019-04-12 10:10:04 +02:00
Alejandro Gallardo Escobar 5d154eee04 Visual Console Refactor: minor fixes 
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
 2019-04-12 10:06:53 +02:00
Alejandro Gallardo Escobar 08ffb3cd2f Visual Console Refactor: fixes 
Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
 2019-04-12 09:51:53 +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
fermin831 153ba4279e Added secondary groups in global search 
Former-commit-id: a569f78754d1f683b1585c235f1f568425c83fad
 2019-04-11 16:57:43 +02:00
Alejandro Gallardo Escobar 3928a5a523 Visual Console Refactor: added the initial version of the background updates 
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
 2019-04-11 10:05:28 +02:00
Daniel Maya 52007832d8 removed refr in view and public_view 
Former-commit-id: fbefbf31bcdb0686890077a85dc1e3a032c84b4d
 2019-04-10 15:02:37 +02:00
Alejandro Gallardo Escobar 00dbb83cfe Visual Console Refactor: minor fixes 
Former-commit-id: e1562bc91ab07db21ae41c4eed6bb8bea0990d62
 2019-04-10 11:54:01 +02:00
Tatiana Llorente 2a37224653 New design for the tables - #3707 
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
 2019-04-10 10:06:27 +02:00
Daniel Barbero Martin 0769c61b19 add map user edit 
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
 2019-04-09 18:18:10 +02:00
Daniel Maya aa01789b19 Added public_view 
Former-commit-id: 15e3f67b28771eb56cd61bff56d1f09a4b3eec78
 2019-04-09 17:45:21 +02:00
Alejandro Gallardo Escobar 0e74c8f894 Visual Console Refactor: simplified code 
Former-commit-id: 5b2f2e91733b99f8c5f18a8e34b7cec18101c242
 2019-04-09 16:36:31 +02:00
Daniel Maya c57b2b7611 Fixed item position and changed visual_console_view name 
Former-commit-id: 985ca0cf474667284d60a025ffe1e4c0aa2e7d5a
 2019-04-09 15:53:22 +02:00
Daniel Maya cb2be4cd6f Added DonutGraph 
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
 2019-04-08 16:21:26 +02:00
Alejandro Gallardo Escobar 4c8736c3a1 Visual Console Refactor: refactored the visual console view 
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
 2019-04-08 10:31:04 +02:00
Daniel Maya 633ccc5f10 Update visual console view 
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
 2019-04-05 14:51:28 +02:00
Tatiana Llorente aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
 2019-04-05 13:19:42 +02:00