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

605 Commits

Author SHA1 Message Date
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00
Luis Calvo f9215af803 Added tooltip to CSV datatable button 2019-11-12 17:33:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
Tatiana Llorente 54c6f3965d Fixed bug with doubles quotes in comments of events 2019-11-07 15:25:19 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 
Conflicts:
	pandora_console/include/functions_ui.php
 2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2019-10-29 17:00:39 +01:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
Daniel Rodriguez adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
fbsanchez a4cff9770f Collaborative session @manuel.montes pagination fix in datatables (hide when only 1 page) 2019-10-04 14:17:14 +02:00
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00
Marcos Alconada f1d20d56e7 Update functions_ui.php 2019-10-01 16:26:22 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
Tatiana Llorente 89253f4111 Added option for custom delimiter in export csv for datatables - #4623 2019-09-13 10:27:14 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
Tatiana Llorente 8fd1f3c99e Added compact mode to show timestamp - #4233 2019-08-29 10:07:50 +02:00
Luis Calvo e71bb2a791 Long custom fields urls and text truncated 2019-08-27 16:01:18 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
Luis Calvo e2e7eeee92 Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:10:37 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
manuel e439e7349f Fixed bug in public visual console view 2019-08-21 09:22:13 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Tatiana Llorente 7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
Daniel Rodriguez 18da97e9a7 Merge branch 'ent-4306-Error-de-paginacion-en-Nodo' into 'develop' 
Fix pagination blank page - #4306

See merge request artica/pandorafms!2580
 2019-07-16 10:49:14 +02:00
fbsanchez e2f3a3fd0c Update functions_ui.php minor adjustment 2019-07-12 12:35:39 +02:00
fbsanchez cca5c7fcf3 Update ui_get_full_url meta with def. target/pandora_console as public_url 2019-07-12 12:27:58 +02:00
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Tatiana Llorente 31b19ab970 Fix pagination blank page - #4306 2019-07-05 09:31:23 +02:00
fbsanchez 879e61b9aa minor fix in public_url_exclusions 2019-07-02 16:47:19 +02:00
fbsanchez eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
Tatiana Llorente 1aa0131a81 Merge branch 'develop' into 'ent-4195-Status-sets-Visual' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-07-02 11:42:19 +02:00
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' 
Ent 4238 eventos csv e historico

See merge request artica/pandorafms!2515
 2019-06-25 18:33:49 +02:00
Daniel Rodriguez 6af895b9c1 Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' 
Added meta option in function ui_print_os_icon - #3999

See merge request artica/pandorafms!2502
 2019-06-25 16:04:51 +02:00
Tatiana Llorente 43b83af2c6 Changed default images status set for css - #4195 2019-06-24 11:59:17 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
Luis Calvo f7f81f5344 Custom fields url improved 2019-06-21 16:26:13 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
fbsanchez 524575171a event history viewer 2019-06-19 12:56:16 +02:00
fbsanchez 37e98d108b fit mc 2019-06-18 19:17:21 +02:00
fbsanchez 823581f398 export current page to csv fixed icon 2019-06-18 12:58:46 +02:00
fbsanchez d8a331bf77 event filters tags, date, module name 2019-06-18 12:48:28 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ebfdce1073 Improved ui_progress documentation 2019-06-14 10:40:30 +02:00
fbsanchez 7226a45df5 improved ui_progress now accepts ajax updates 2019-06-14 10:35:10 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
Tatiana Llorente 018c942ecb Added meta option in function ui_print_os_icon - #3999 2019-06-13 15:04:39 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Alejandro Fraguas 9791b174b2 Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop' 
Ent 4030 bug en busqueda de inventario

See merge request artica/pandorafms!2431
 2019-06-05 10:23:43 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
fbsanchez c2346842c9 ui_toggle revierw 2019-05-29 18:13:21 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
fbsanchez 121ae89b1d dyn style ui_print_help_tip 2019-05-29 17:34:11 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +02:00
fbsanchez 505229abe4 minor style change - box 2019-05-29 13:03:58 +02:00
fbsanchez 49dee1e2bc Next contact to seconds 2019-05-29 12:42:55 +02:00
fbsanchez 5ec162e058 Data title events 2019-05-29 11:24:17 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
fbsanchez 99e485e96e toggle updated 2019-05-28 16:24:28 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +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 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 954dd0b43a UI_toggle updated 2019-05-27 19:08:41 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00