c084adfa27
Add module filter by text -#2094
2019-06-20 09:31:36 +02:00
988eb2e257
Add module filter by text -#2094
2019-06-19 17:36:55 +02:00
45d544ca5d
remove typo error in commit
2019-06-19 15:14:41 +02:00
5503abc8e1
fix bug in metaconsoles network component creation
2019-06-19 15:12:17 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
d290b91b28
RC1 event viewer v2
2019-06-18 16:07:53 +02:00
10b337f713
Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop'
...
Add javascript for insert name to reports
See merge request artica/pandorafms!2424
2019-06-18 13:53:52 +02:00
c68f2ada94
Merge branch 'ent-4085-no-se-muestra-lista-de-modulos-con-licencia-invalida' into 'develop'
...
Fixed module_manager with Agent limit surpassed or license expired
See merge request artica/pandorafms!2475
2019-06-18 13:02:43 +02:00
8f2feac676
Added DESTDIR in license.php
2019-06-18 11:35:59 +02:00
9bdf048fae
Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers
2019-06-17 16:39:27 +02:00
2401ac5c6e
Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop'
...
Change module type ifOperStatus on Interface Wizard
See merge request artica/pandorafms!2473
2019-06-17 16:34:14 +02:00
132076198d
minor fixes and event ACL - groups
2019-06-14 13:20:34 +02:00
4362bf3131
Merge branch 'ent-3429-event-report-options-saving' into 'develop'
...
Added missing options parameters
See merge request artica/pandorafms!2173
2019-06-14 13:19:43 +02:00
5c7b45173b
Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop'
...
fix bug in item edition in metaconsole
See merge request artica/pandorafms!2500
2019-06-14 13:05:27 +02:00
8554baef20
fix bug in item edition in metaconsole
2019-06-13 11:11:39 +02:00
af62bb1ae3
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:47:53 +02:00
7d54a37e13
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:44:09 +02:00
f399023d46
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
...
Solucionado pantalla en blanco
See merge request artica/pandorafms!2269
2019-06-12 14:25:58 +02:00
b930588f84
Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
...
Ent 3892 bug en bulk operations de plugins
See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
1305e267de
Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop'
...
Remove autocomplete user and password in the form to create wmi modules - #3437
See merge request artica/pandorafms!2485
2019-06-12 13:03:56 +02:00
c1d1c23a4f
Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph
2019-06-12 12:37:52 +02:00
608f079ca0
now you need put an agent or visual console, else you cant create or update a Static Grap
2019-06-12 12:36:56 +02:00
fdce139f84
Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop'
...
fix bug when adding connection maps in gis map builder
See merge request artica/pandorafms!2490
2019-06-11 18:01:54 +02:00
e4139874dd
Removed option to show qr code in header - #4196
2019-06-11 18:00:41 +02:00
cc9a7553bc
Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
577ddef8b3
fix bug when adding connection maps in gis map builder
2019-06-10 17:04:36 +02:00
ef3d299d58
wip event view
2019-06-10 15:18:35 +02:00
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
4f9f9e65c2
Remove autocomplete user and password in the form to create wmi modules - #3437
2019-06-06 16:51:11 +02:00
c6d1bb6533
Fixed fields not saving in event reports
2019-06-06 10:33:46 +02:00
3475684cdc
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-05 09:36:57 +02:00
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
974db824a8
style review
2019-06-03 19:13:29 +02:00
efd7abfc66
Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
...
ticket resolved
See merge request artica/pandorafms!2207
2019-06-03 18:16:32 +02:00
31257c02a4
style review
2019-06-03 14:50:22 +02:00
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
ddf3b7a258
Review 1
2019-06-03 11:21:44 +02:00
9de5dadbf2
style review
2019-06-03 11:16:51 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
1aa6d8c298
Change module type ifOperStatus on Interface Wizard
2019-05-31 10:39:48 +02:00
69054571ab
Style review
2019-05-31 09:50:59 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
16d34bf584
Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
...
ticket resolved, duplicated sentece
See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
94153b823f
Help links
2019-05-30 11:25:09 +02:00
30320b7897
Fixed login button style and removed help icons from agent_management
2019-05-30 11:12:37 +02:00
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
f16f35ad10
Changes styles
2019-05-29 17:49:09 +02:00
3c730fbedf
BC updated
2019-05-29 17:10:21 +02:00
47c9220cbb
clippy positions and control overflow
2019-05-29 17:02:01 +02:00
8c0bfd72a8
avoid icon overlap report view lsit
2019-05-29 16:52:38 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
2e3338b595
Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
...
Ent 3961 añadir caché para los elementos de la consola visual
See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00
4a42756ec6
group_management styles profiles
2019-05-29 15:44:51 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
487ff53825
Min. fields lenght headers
2019-05-29 12:09:45 +02:00
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
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
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
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
32424ddae1
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 10:50:38 +02:00
5e3ca1664f
UM unregister restriction, only admins
2019-05-29 10:37:02 +02:00
4a60dbe415
Unregistration form
2019-05-29 10:27:28 +02:00
28555e09de
Unregistration form
2019-05-29 10:26:53 +02:00
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
c35cb56699
fixed errors
2019-05-29 08:50:46 +02:00
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
6fdd88ab65
Fixed errors on eHorus user level conf
2019-05-28 17:19:13 +02:00
3b943ae902
fixed errors disabled/enabled module from list agents because not write in conf
2019-05-28 17:11:14 +02:00
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
92ca217800
minor fixes in style view tasklist
2019-05-28 10:57:36 +02:00
e338d5ba95
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-27 22:40:11 +02:00
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
3736d84589
Edit ehorus user
2019-05-27 18:49:47 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
f0fb6d7fd9
wip styles
2019-05-27 18:03:56 +02:00
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
513a74d120
Removed empty help icons in local components
2019-05-27 17:13:25 +02:00
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
0280547465
some changes
2019-05-27 15:41:23 +02:00
bc64589046
fixed error create modules
2019-05-27 15:27:46 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
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
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
0ee2ed6f5e
Removed empty help icons in modules
2019-05-24 12:59:25 +02:00
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
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
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
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
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
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
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
0ee42fbafe
fixed: um url relative
2019-05-23 11:23:42 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
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
7b5ae40868
multiple fixes
2019-05-23 10:27:50 +02:00
0728c73844
fixed bug in macros of plugin modules
2019-05-22 19:14:01 +02:00
2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +02:00
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
86cb526893
minor fix MC environments
2019-05-22 15:40:17 +02:00
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
f6171de522
Merge branch 'ent-3468-Ayudas_online' into 'develop'
...
helpers
See merge request artica/pandorafms!2381
2019-05-21 17:28:27 +02:00
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
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
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
0046e209fe
lint changes
2019-05-17 14:46:19 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
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
0cd60d0431
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
2019-05-16 18:11:33 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
c40e0ec702
pandora_console/extras/delete_files/delete_files.txt
...
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
0f35923073
Recovered event criticity field from event alert
...
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
3cdbfd3646
minor fix in php requirements
...
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
2019-05-16 12:50:16 +02:00
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
8f2dce439b
Add javascript for insert name to reports
...
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
2019-05-16 12:13:58 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
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
ff8abf9b40
updated function for show and hide ehorus form
...
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
6e35f6aec7
UM updates and fixes
...
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
2019-05-14 13:41:21 +02:00
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
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
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
421e6b559d
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
2019-05-14 11:46:39 +02:00
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
4497554b37
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
2019-05-14 10:40:49 +02:00
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
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
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
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
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
b6e8578d1d
Fixed a minor sintax error - #3611
...
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
14717a6c6d
Fixed merge conflict
...
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
2019-05-13 15:15:14 +02:00
e6fa42ddca
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
895588ebe0
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
2019-05-13 15:00:35 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
e9082c5d8a
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +02:00
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
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
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
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +02:00
12c9952e4a
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
43ce4f9883
Added helps
2019-05-09 17:20:27 +02:00
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
23b3d07f37
Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated
2019-05-09 09:29:27 +02:00
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
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
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
72a127c085
Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
...
Fixed pagination in Alert templates
See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
247605f308
Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
...
Eliminated the cache when update agents
See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
610e0dabbf
Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts
2019-05-08 11:17:15 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
b2b4372c9d
Added helps
...
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +02:00
fff3a783a1
Se restablece archivo modificado
...
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
eb64dbae86
add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item
...
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
2019-05-03 14:16:26 +02:00
7da5f518d8
Fixed the form when you try to create an agent without alias - #3611
...
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
2019-05-03 14:00:24 +02:00
7d8f9f7798
fix lint errors
...
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
2019-05-03 13:54:39 +02:00
5b3dfcbf74
add feature to enable obfuscation on command fields when creating or updating commands
...
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
2019-05-03 13:46:52 +02:00
b3a4d9edf1
New View Create/Update Agent - #3611
...
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
2019-05-03 13:24:15 +02:00
9f3c586b55
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
7721c0e605
New View Create/Update Agent - #3611
...
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
16f687574e
Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
...
Fixed bug in unlinked modules
See merge request artica/pandorafms!2347
Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
e424a2a684
Fixed bug in unlinked modules edition
...
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
db4cfaf1b7
fixed errors reporting_builder.php
...
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
2019-05-03 12:11:20 +02:00
9b9d2a3647
fixed errors reporting_builder.item_editor.php
...
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
2019-05-03 10:39:29 +02:00
b1dd6edc64
Added changes in helps
...
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
7045e59e87
Added changes in helps
...
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
2019-04-30 10:44:53 +02:00
e9e24505fe
Added option in massive delete alerts to show alerts on disabled modules
...
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
d16b96309b
Fixed pagination in Alert templates
...
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
2019-04-29 14:45:11 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
4347502f84
Se arregla error en el editor de plugin
...
Former-commit-id: c2fb78ac02e27cffcefc843a241ed13df2077b92
2019-04-29 11:56:48 +02:00
da8507c4b4
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
50e994e065
Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
...
change way to print discovery simple multiple inputs
See merge request artica/pandorafms!2378
Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
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
fc40518e65
minor fix in task description (Discovery.cloud.aws.rds)
...
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
7433d52130
change way to print discovery simple multiple inputs
...
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
f116bfc3fd
Updated discovery task selector
...
Former-commit-id: dc692cd11f2bd81dcb7d4dea57954d77562ef561
2019-04-24 10:10:08 +02:00
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
2bafba0764
Se añade el contenido del fichero borrado
...
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
2019-04-23 17:40:49 +02:00
1eeba6855e
New style for update manager online - #3608
...
Former-commit-id: 488cdae753c5a7fff6e1c69dce4da9675e4ef425
2019-04-23 13:57:12 +02:00
a79092ded0
New style for update manager online - #3608
...
Former-commit-id: 43222aa59ceb936bf4c16fc73d08bba04f65abd9
2019-04-23 11:41:45 +02:00
ecd63667e5
New style for update manager online - #3608
...
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
579c9e7083
New style for update manager online - #3608
...
Former-commit-id: 5c69869fb8c79071589c16d25b5bf314910dc501
2019-04-23 10:12:35 +02:00
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
973ce07811
New style for update manager online - #3608
...
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
20058be56a
Fixed visual bug in policies operations actions
...
Former-commit-id: c47606c0c53e74b1ac8610f0be6bd0228e14d42a
2019-04-22 16:37:06 +02:00
2ca68daf9a
New style for update manager online - #3608
...
Former-commit-id: ea7a378d1c4092b3b0540fe2a94ae7415e7a200e
2019-04-22 15:45:57 +02:00
518a9a1eed
New style for update manager online - #3608
...
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +02:00
f06e81dcc4
Discovery: Minor update in description and extra information in log
...
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
19ec5a0733
minor fix
...
Former-commit-id: 34ebb713083bce476e15483e710f23295cf842cb
2019-04-22 13:26:17 +02:00
ca05867e55
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
2019-04-22 13:23:58 +02:00
fa0da4504e
Fixed bug connection ok when db connection returns null
...
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00:06 +02:00
e9af2b6a1e
Breadcrum fix do not rollback...
...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +02:00
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
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
274c78f647
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: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
ed3155c053
New View Create/Update Agent - #3611
...
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
cfff9c065d
New View Create/Update Agent - #3611
...
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
68b69d66c4
Fixed bug in report deletions
...
Former-commit-id: 1ef6173b079d88316c248f1f3cdaa47290ed6212
2019-04-17 09:07:12 +02:00
d5b83b867b
Visual Console Refactor: bugfix
...
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
bac1e44608
Removed autofill proxi in auth server
...
Former-commit-id: 448622c39e6697ead1a3a515da3e573abfc0384d
2019-04-16 12:37:06 +02:00
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
553ec48f54
changed title plugin creation to plugin registration
...
Former-commit-id: bd5ee299d91c52d3064eafa85b092b525b70381a
2019-04-15 15:21:07 +02:00
8c27411be6
Delete plugin.php
...
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
2019-04-15 15:18:22 +02:00
a3787c687c
prueba
...
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
2019-04-15 15:10:43 +02:00
072fec3dd1
removed map link from mysql/oracle/RDS discovery tasks
...
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +02:00
7a1a682248
Added advice when a primary group will be selected when is currentl a secondary group
...
Former-commit-id: ca23bc1f24b901c2300385ee6d3468dc5059d51d
2019-04-12 13:09:26 +02:00
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
c33a2cfaf6
Change arrow images to sort the table in custom reports - #3707
...
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
834d5d6c50
WIP:Discovery RDS
...
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
6276936e1d
Added info message
...
Former-commit-id: 11f4c9c8b52f6ef3bed2236534010f2caa3bb8e0
2019-04-10 17:51:50 +02:00
5998b30a16
Added css hint to discovery tasks when task list is empty
...
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
2019-04-10 17:30:35 +02:00
fd7cbf14cd
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
30c5f2b243
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' of brutus.artica.lan:artica/pandorafms into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 77343765f8b254939406fc320fc64dce86672b6f
2019-04-10 10:09:21 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
e59ce5412c
WIP Discovery RDS
...
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
021fc1dbfd
Fixed bug in unlinked modules
...
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +02:00
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
550eb3cd3e
change name label from visual_console_builder.elements.php
...
Former-commit-id: 71201d54200624452c4dd75231894d4cd4e29031
2019-04-08 15:30:07 +02:00
41ea1a4c66
Fixed minor visual bug - #3707
...
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +02:00
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
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
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
970a10ba50
fixes in non agent per database
...
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
2019-04-05 10:41:37 +02:00
db9068e25a
fixes in non agent per database
...
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
2019-04-05 10:41:09 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
9c3d26f120
Deleted Servers menu option for operator(read)
...
Former-commit-id: 89723d23cb2199152cfc9f3d72997ddcd7b31796
2019-04-03 11:22:20 +02:00
11b2fbc245
WIP db
...
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
9fe8dcdda3
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
431c807f61
Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
...
# Conflicts:
# pandora_console/extras/mr/27.sql
Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
ee6d8642f3
Merge branch 'ent-3805-nombre-agente-guarda-sin-guion' into 'develop'
...
Fix agent name input to allow '-'
See merge request artica/pandorafms!2319
Former-commit-id: 9496fa004ee36b8d09c875a77cf3f19bec45a130
2019-04-01 18:49:11 +02:00
f3c3c3f371
Merge remote-tracking branch 'origin/develop' into ent-3807-html-special-chars-conversion
...
Former-commit-id: a9cc855e55efd868a58374cc9148a7e1b0082ee4
2019-04-01 18:05:11 +02:00
4c95a160de
Changed Jquery .text for .html for html conversion
...
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
2019-04-01 17:57:22 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
a0f4eb1910
change discovery page title
...
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
d890d25574
Fixed db query bug
...
Former-commit-id: 4eef9808433009c2725956103b4338f70bfe1403
2019-03-26 15:57:54 +01:00
0d8322aeda
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
e3b0b7ad11
fixed update progress bars task for 3 second
...
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
a7ff654826
Removed output in netflow filter
...
Former-commit-id: 4f2cfac6efe1482c86179601bac88826057e7d5c
2019-03-26 11:58:31 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
448a5e64ea
Fixed disabled custom logo in open version
...
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
8d8b856864
Fixed create from bug: added action with refresh url
...
Former-commit-id: b63f6e6f9169a35d9dcb9cfd078c35fd4deafdac
2019-03-22 14:03:38 +01:00
af9936c78f
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/install.php
Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
1a01c311d6
Fixed down paginations in manage agents
...
Former-commit-id: 28f7546b2d0cc8f4e1d13763e9c92ac99c2de2f9
2019-03-20 18:30:52 +01:00
Tatiana Llorente
alejandro-campos
fbsanchez
Alejandro Fraguas
Daniel Rodriguez
Daniel Maya
Luis Calvo
marcos.alconada
ismael.moreno
Daniel Barbero Martin
Alejandro Gallardo Escobar
manuel
root
slerena
Ramon Novoa
fermin831
samucarc