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

10882 Commits

Author SHA1 Message Date
fbsanchez 30ce8f65e4 UM register, UM newsletter flow improved 2019-05-29 10:01:21 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +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
fbsanchez d64e2cfb8c Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 18:05:33 +02:00
Luis Calvo 8e7b769977 Merge branch 'ent-3924-eHorus-settings' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3924-eHorus-settings 2019-05-28 18:04:52 +02:00
Luis Calvo 58a0ef1bf7 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 18:03:55 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis c8297165e8 Undo undesired changes 2019-05-28 17:41:39 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +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
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
Alejandro Fraguas 1df2bd3c21 Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop' 
Ent 4101 cambios vista gráfica de módulo

See merge request artica/pandorafms!2462
 2019-05-28 13:30:11 +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
Alejandro Fraguas a3591b799a Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop' 
fix minor bug in reporting functions

See merge request artica/pandorafms!2460
 2019-05-28 12:03:55 +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
Alejandro Gallardo Escobar 5ea79cdfb8 Now only the Group item of the VC is cached by user 2019-05-28 10:39:34 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
Tatiana Llorente a6c0a082a7 Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo 2019-05-28 08:55:15 +02:00
fbsanchez 8bfb1e6773 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 08:32:53 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +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
alejandro-campos 58d0dc5dbc fix minor bug in reporting functions 2019-05-27 18:31:20 +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
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
Alejandro Gallardo Escobar fb8bc48d64 Now the vc item's cache expires when the item is updated 2019-05-27 16:40:09 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
Tatiana Llorente 016a5b3745 Changed image for severity in modal events window - #4102 2019-05-27 15:51:03 +02:00
Tatiana Llorente 0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +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 f8a0fc67f9 Minor improvements 2019-05-27 12:10:05 +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 83602e07b9 Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4 2019-05-27 11:06:29 +02:00
artica de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00
artica a13701ed82 Auto-updated build strings. 2019-05-25 00:01:06 +02:00
fbsanchez 1d403ec2f8 SNMP Browser fix 2019-05-24 13:42:49 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +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
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
Daniel Barbero Martin 1386a44e07 fixed errors label report 2019-05-23 17:52:28 +02:00
fbsanchez 9e1de4cbb3 Merge branch 'ent-1668-update-manager' into 'develop' 
rb UM GCv

See merge request artica/pandorafms!2447
 2019-05-23 16:16:26 +02:00
fbsanchez 4ec6aadf7d rb UM GCv 2019-05-23 16:12:40 +02:00
fbsanchez f1c077b753 Merge branch 'ent-1668-update-manager' into 'develop' 
UM GCv

See merge request artica/pandorafms!2446
 2019-05-23 16:09:16 +02:00
fbsanchez 4abbbf6680 UM GCv 2019-05-23 15:55:07 +02:00
fbsanchez 5d4ba6cb01 Merge branch 'ent-1668-update-manager' into 'develop' 
summarized counts

See merge request artica/pandorafms!2445
 2019-05-23 15:47:25 +02:00
fbsanchez 08aa824f97 summarized counts 2019-05-23 15:38:45 +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
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
fbsanchez 7b5ae40868 multiple fixes 2019-05-23 10:27:50 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +02:00
Daniel Rodriguez 8b511c2ca3 Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop' 
Changed condition for ldap Force automatically create profile user

See merge request artica/pandorafms!2422
 2019-05-22 16:15:06 +02:00
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +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
marcos.alconada 07b42f7241 Changed for metaconsole 2019-05-22 13:57:31 +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
artica ba9edc0378 Auto-updated build strings. 2019-05-22 00:01:07 +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 b853582fb9 Changed preview by \"click here\" message 2019-05-21 08:29:59 +02:00
artica 20e38ead81 Auto-updated build strings. 2019-05-21 00:01:08 +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 a898fad2c3 lint fixes 2019-05-20 10:35:46 +02:00
artica d82d178a0d Auto-updated build strings. 2019-05-20 00:01:08 +02:00
artica 2dc5fce6a6 Auto-updated build strings. 2019-05-19 00:01:06 +02:00
artica 509c476c33 Auto-updated build strings. 2019-05-18 00:01:08 +02:00
alejandro-campos 54d3eefa43 lint changes 2019-05-17 14:27:59 +02:00
alejandro-campos e746a49158 lint changes 2019-05-17 14:26:44 +02:00
Alejandro Gallardo Escobar bdcea7ec7d Minor fix 2019-05-17 14:25:17 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +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
marcos.alconada 0c9f8892e0 Changed evaluates permissions 2019-05-17 13:58:34 +02:00
Alejandro Fraguas ea39766d59 Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop' 
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop

See merge request artica/pandorafms!2427
 2019-05-17 12:11:19 +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
artica bf202496da Auto-updated build strings. 
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
 2019-05-17 00:01:10 +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
Luis Calvo b3d2eaaf9e Fixed img url on js 
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
 2019-05-16 17:25:18 +02:00
Luis Calvo 1bfd91725e Changed <img> to hmtl_print_image 
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
 2019-05-16 17:13:14 +02:00
Daniel Maya f1705af9f6 Fixed error window in visual console 
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
 2019-05-16 16:04:38 +02:00
fbsanchez c8c0194183 Minor fix in url 
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
 2019-05-16 12:33:05 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00