2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +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
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
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +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
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
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
14717a6c6d
Fixed merge conflict
...
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
2019-05-13 15:15:14 +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
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
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
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +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
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +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
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +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
fa0da4504e
Fixed bug connection ok when db connection returns null
...
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00: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
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
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +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
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
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
dd8265f65e
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
1020ec1bd7
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
35633d181b
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
450eccee7f
ticket resolved, duplicated sentece
...
Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
2019-03-05 13:17:21 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
12a287f322
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
3f53541c5e
Added switch to enable NTA
...
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
f0a3f4e9d7
Added configurable purge tnetwork_matrix
...
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
094a5c17d8
Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop'
...
disable double authentication option on user edit when disabled in authentication setup
See merge request artica/pandorafms!2054
Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
2019-02-20 09:56:49 +01:00
2e78012e40
Fix double authentication check in meta authentication setup
...
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
2019-02-19 13:13:13 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
bb83f4ba4a
avoid to show notification if disabled by user
...
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
2019-02-18 17:08:23 +01:00
34cf0bd837
minor fix acl check in notifications
...
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
2019-02-18 14:01:17 +01:00
2c97708373
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
...
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
624d804168
Fixed minor error
...
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
2019-02-14 16:53:01 +01:00
d9ba3af358
Fixed errors in setup performances
...
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
2019-02-14 16:31:19 +01:00
0fb61444f6
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
2019-02-14 08:01:23 +01:00
0ecf2bb9c4
Added pandora db messages purgue
...
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
fe50d6caff
Open toasts and messages into new window
...
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
cc2b2709f9
Show the notifications with AJAX
...
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
105341e553
Removed unwanted traces (again)
...
Former-commit-id: c6453610177b1894bc9d65c8297cd4f8ee01092d
2019-02-12 16:01:24 +01:00
325f5e8775
Added onclik con notification toasts
...
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
2019-02-12 15:27:14 +01:00
36dd59b250
Added changes without delete install.php
...
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
2019-02-12 13:29:43 +01:00
af90734436
Revert "Merged from discovery and validated"
...
This reverts commit e744dd50eb
2019-02-12 13:29:04 +01:00
e744dd50eb
Merged from discovery and validated
...
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
2019-02-12 13:14:22 +01:00
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
17c012cd83
Added update ball notifications
...
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
2019-02-11 14:44:14 +01:00
a50a251b00
Added filter to get last messages by notification ball
...
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
2019-02-11 13:35:36 +01:00
4b86683d23
Fixed style
...
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
80a5d0b0b9
Removed unused code and format some files
...
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +01:00
04b2cb8665
Use real ids instead fake ids
...
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
2019-02-07 18:04:14 +01:00
7fa344c2a4
Change the global configuration notification to AJAX
...
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
bf7e7f1e5c
Fixed merge errors
...
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
2019-02-06 18:11:50 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
d113bfbeb8
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
2019-02-06 17:02:58 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
ddcf0bbd16
Added deletion on global notification config
...
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
7df3fe2dac
Added functionallity to Add element on notification global config
...
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
b4f3e94b13
Clean dialog box on creation
...
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
2019-02-05 15:31:08 +01:00
68bdbd511c
Fixed add consecutive source elements
...
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
2019-02-05 13:46:16 +01:00
8811257762
Popup to add groups and sources to global notification configuration
...
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
54f0bc1a03
Disable selec boxes when click notify all users on notifications global config
...
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +01:00
d2a3d3bbbc
Added all users in global notifications config
...
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
1c0a5ca247
Added pospone select (fixme)
...
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
75eaa875c9
Added checkboxes to notifications global configuration
...
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
01bc0775bc
Added notification global configuration (only enable and disable)
...
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
1d7f5365ab
add params setup historic database
...
Former-commit-id: 6a2d0cf00f18ceee467ca98279adf5285ea161dd
2019-01-30 12:07:17 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
c05b4c53e8
fix bug when updating path of ssl certificate in general setup
...
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +01:00
1b78c1a78d
fixed error log js and warning php visual style
2018-11-23 09:21:22 +01:00
c131c631d4
Fixed bug in visual styles configuration
2018-11-07 16:34:09 +01:00
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
fcb95a8d8d
Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop'
...
visuals fix in visual styles
See merge request artica/pandorafms!1731
2018-10-25 13:16:57 +02:00
5255ced7d1
Merge branch '2762-Poner-capitalizacion-correcta' into 'develop'
...
Capital letter in the letter a of audit - #2762
See merge request artica/pandorafms!1766
2018-10-25 11:55:15 +02:00
f824650642
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-16 15:42:17 +02:00
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
e318d9539c
Added favourite services configuration tokens
2018-09-19 16:56:58 +02:00
69ec75e392
Capital letter in the letter a of audit - #2762
2018-09-14 09:38:36 +02:00
f117d1af43
fixed heigth charts for reports
2018-09-11 09:33:24 +02:00
7d6bf289f8
visuals fix in visual styles
2018-09-05 08:23:57 +02:00
dae0021db9
Changed soft graphs hint
2018-08-28 11:02:27 +02:00
06c436e5bf
add new tocken zoom graph visual styles
2018-08-03 10:01:04 +02:00
0dd39f1f00
fixed errors in graph slice for uncompresed
2018-07-05 11:52:52 +02:00
4214577eea
Added new token for static graph height
2018-06-19 18:27:04 +02:00
7fe88d761e
remove setup resolution graph
2018-06-13 11:32:03 +02:00
9ecc770519
remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces
2018-06-13 11:02:58 +02:00
25942907cf
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-06-12 15:46:41 +02:00
2d6fa8d0e0
fixed errors graphs
2018-06-12 15:46:05 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
a54c074b11
[Rebranding] Added hide help on node
2018-05-25 10:29:40 +02:00
6675597b62
[Rebranding] Minor fix
2018-05-24 18:35:20 +02:00
750ed29ac9
[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable
2018-05-24 16:59:50 +02:00
063865e179
[Rebranding] Refactorized logos preview in nodo
2018-05-24 12:50:24 +02:00
9935b7f8a3
[Rebranding] Added custom logo to node request new license
2018-05-22 16:49:49 +02:00
0e3db1eb80
[Rebranding] Added custom logo to network maps central node
2018-05-21 18:26:28 +02:00
8f2302630c
[Rebranding] Docs and Support login icons are configurables
2018-05-21 14:29:11 +02:00
3497132517
[Rebranding] Moved rebranding to visual styles section
2018-05-21 11:56:16 +02:00
a3ebd00876
[Rebranding] Node setup and footer
2018-05-09 13:12:03 +02:00
e77b9f35b6
Improved the help of the WMS server connection creation
2018-05-08 17:29:58 +02:00
cc06dfe876
Added a new GIS map source type called WMS
2018-04-27 12:17:42 +02:00
18f3020785
Change fixed header and fixed menu positions - #1844
2018-02-28 19:02:54 +01:00
9d36887a02
Fixed graph precision
2018-02-28 14:33:22 +01:00
f4b36a941c
Change data precision visual styles token tooltip - #1634
2018-02-07 13:32:55 +01:00
fe4b1da1e3
Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop'
...
Make help and support links in login page customizables - #1709
See merge request artica/pandorafms!1201
2018-02-06 11:57:23 +01:00
86a581ec02
Merge branch '1420-Formato-en-footer-y-header-de-PDF-4649-com1' into 'develop'
...
Add tinymce buttons to header a footer editor in visual styles - #1420
See merge request artica/pandorafms!1189
2018-01-29 12:55:49 +01:00
c5d778fd14
Merge branch '1650-Public-url-rompe-vista-móvil-si-no-acaba-en-/-dev' into 'develop'
...
Added help_tip in public url
See merge request artica/pandorafms!1125
2018-01-29 12:53:02 +01:00
74b4f2a5f3
Add optional token animation and vissual effects in visual styles configuration view - #1724
2018-01-08 13:01:29 +01:00
78899cc1c7
Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop'
...
add new funtionality view favourite console visual
See merge request artica/pandorafms!1211
2018-01-02 10:31:31 +01:00
0b5678fba6
add new funtionality view favourite console visual
2017-12-28 15:13:06 +01:00
3ee088da81
Fix default custom logo select value in visual settings for front of reports - #1725
2017-12-21 15:14:22 +01:00
d9884fd431
Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop'
...
Resolve: "Actualizar el cliente de eHorus"
See merge request artica/pandorafms!1055
2017-12-21 10:57:15 +01:00
a027defccd
Make help and support links in login page customizables - #1709
2017-12-20 19:14:05 +01:00
a14c91dfa0
Add tinymce buttons to header a footer editor in visual styles - #1420
2017-12-15 12:29:13 +01:00
9a96103164
Merge branch '1257-Traducciones-consola-open' into 'develop'
...
Change texts in pandora - #1257
See merge request artica/pandorafms!1062
2017-12-14 15:56:54 +01:00
1840d08f7a
Added help_tip in public url
2017-11-27 16:55:42 +01:00
a455ba666a
Added code to login with admin ldap user
2017-11-24 14:03:49 +01:00
089a0f94ea
Change texts in pandora - #1257
2017-11-14 11:37:49 +01:00
d0ec4bb4bc
[Console] Changed the link to the eHorus page into the setup
2017-11-13 11:32:14 +01:00
3cbe8fa585
Merge branch '1228-Posicion-fija-para-boton-update-en-setup-visual-styles' into 'develop'
...
Apply comfort displacement to update button in visual styles section - #1288
See merge request artica/pandorafms!794
2017-10-26 13:54:03 +02:00
0d6804d052
Merge branch '1121-Icono-personalizado-por-agente-en-mapas-GIS-4283-2' into 'develop'
...
Add agent icon group marker option in setup visuals for GIS maps - #1121
See merge request artica/pandorafms!848
2017-10-26 11:06:48 +02:00
45743e2dc5
Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto
2017-10-06 08:37:56 +02:00
ca24fbc270
Change token text in general setup - #1255
2017-10-05 12:58:40 +02:00
13f12baa33
Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop'
...
Use alias as name with option default tconfig - #1255
See merge request !803
2017-10-04 15:52:17 +02:00
4ec6b4e053
add new select to setup for TIP
2017-09-26 11:53:57 +02:00
69f670d851
Add agent icon group marker option in setup visuals for GIS maps - #1121
2017-09-22 15:07:13 +02:00
08ac4c2f35
Merge branch '161-Massive-Operations-remains-at-Console' into 'develop'
...
"Massive Operations" had remained at Pandora Console.
Closes #161
See merge request !729
2017-09-18 10:12:41 +02:00
74e4ae3f71
Use alias as name with option default tconfig - #1255
2017-09-08 12:11:15 +02:00
c2a132255c
Merge branch '1057-No-muestra-imagenes-PNG-en-el-custom-logo-de-los-informes-OPEN' into 'develop'
...
Let use png logo images for reports - #1057
See merge request !625
2017-09-08 10:13:35 +02:00
da3905a593
Apply comfort displacement to update button in visual styles section - #1228
2017-09-07 13:25:39 +02:00
3a9895b97b
Added min size to the field
2017-09-04 16:58:55 +02:00
70a226540e
"Massive Operations" had remained at Pandora Console. #161
2017-08-14 12:03:35 +09:00
1772cc273b
Merge branch '1012-Problema-con-configuración-de-LDAP-dev' into 'develop'
...
Erase functionality
See merge request !613
2017-07-13 11:56:17 +02:00
9a85c47f9e
Replaced references to switch.ehorus.com with portal.ehorus.com.
2017-06-30 21:14:55 +02:00
b6d4416921
Let use png logo images for reports - #1057
2017-06-28 12:37:40 +02:00
42b822a07a
Erase functionality
2017-06-22 15:27:00 +02:00
7bfd3254a7
Merge branch '656-changes-in-system-log-viewer-dev' into 'develop'
...
Added changes
See merge request !518
2017-06-14 11:32:44 +02:00
61a9d923a4
Merge branch '889-Remove-babel-auth-in-pandora-dev' into 'develop'
...
Removed babel
See merge request !502
2017-05-31 17:34:47 +02:00
6bf672a846
Added changes
2017-05-26 14:47:37 +02:00
63554c54a2
Removed babel
2017-05-23 17:55:37 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
893707a024
Remove trace
2017-04-10 14:39:31 +02:00
9cd99307dd
Added selector in visual conf to select a csv divider
2017-04-10 13:58:42 +02:00
aeb8e74bdc
delete help in visual setup
2017-03-22 15:54:53 +01:00
e252135979
merge develop
2017-03-15 17:09:40 +01:00
aec0d91109
login page new
2017-03-15 15:23:28 +01:00
0b62513fea
Updated translations. Ticket #347
2017-03-14 16:17:13 +01:00
c50fd249be
Fixed error without enterprise.
2017-03-07 19:20:18 +09:00
b184a75065
Fixed styles in visual setup administration. Gitlab: #360
2017-02-22 14:12:33 +01:00
fb8f05808e
Fixed bad text in pandora performance. Ticket #233
2017-02-22 12:48:35 +01:00
83776e46d1
Changed some texts in pandora. Ticket #347
2017-02-22 12:36:30 +01:00
fb36235e6f
Update a URL to point to updatemanager7.
2017-02-17 11:57:05 +01:00
36aa73bdd8
Make alert messages window draggable, zindex 3, change disable logo in graph - #52
2017-02-10 10:18:53 +01:00
e7bb60b61d
Added open images folder to custom logo edit in setup visual. Ticket #51
2017-02-09 09:22:14 +01:00
cafda2a116
Added new option to see the menu bar in classic mode. Ticket #234
2017-02-07 12:58:29 +01:00
3e0b0f231b
Added more fields to alert macro fields. Ticket #233
2017-02-06 16:20:39 +01:00
afd3322d52
Added new options to servicemap. Ticket #218
2017-02-01 11:57:10 +01:00
7c761c8080
Show/hide front page custom report display or not in setup visual on click - #35
2017-01-31 19:13:37 +01:00
60d8a6603e
Add description section in html viewer, settable on setup/visual styles - #36
2017-01-27 17:25:10 +01:00
d066c5f88f
Erase integria incidents integration with integria tickets - #29
2017-01-25 12:40:42 +01:00
362ea41ea2
Merge branch '10-sincronizacion-usuarios-metaconsola-active-directory' into 'develop'
...
Add select profile, group and tags when autocreate user in few options.
See merge request !43
2017-01-17 15:14:46 +01:00
24c0c8c12b
Add select profile, group and tags when autocreate user in few options. And add metaconsole replication users in node
2017-01-17 15:09:23 +01:00
1f07d8a022
Added module value control to shows units in max, min and avg values. Ticket #159
2017-01-17 11:38:00 +01:00
e9fc39b53b
add percentil dinamic ticket: 4262
2016-12-23 09:36:44 +01:00
e1b3f115e0
Added separated field to purge inventory data. Ticket #128 GitLab
2016-12-14 13:02:10 +01:00
00c81d5863
Added new radio button to interface graphs (area or line graph) and fix agents graph section type (now get the stack value from the visual config). Ticket #4110
2016-11-30 10:23:06 +01:00
e80a76901b
add new option visual setup for show only average in graphs or min and max ticket: 4076
2016-11-14 16:30:44 +01:00
5df6061449
Remove log traces
2016-11-11 10:37:06 +01:00
cc10f01c10
Feature: add warnings when history days is more less than purge days
2016-11-11 10:36:32 +01:00
f5cd834dd0
Change helptip in timeout session. Ticket: #4168
...
(cherry picked from commit e25013aec7
2016-11-08 16:28:24 +01:00
3389fa28a3
fixed setup_auth ticket: 4170
2016-11-04 14:10:07 +01:00
b78d417410
fixed visual error setup autentication ticket: 4152
...
(cherry picked from commit 46e70e038d
2016-11-02 16:54:21 +01:00
21ddb758ba
Fix Dark background and comments for Enterprise popup community version - #65
2016-10-28 18:11:53 +02:00
3d45b3e9a9
Load images in visual setup logo selector - #99
...
(cherry picked from commit 8e13818105
2016-10-24 14:44:53 +02:00
6c185386ac
Data precision... (Added integer controll between 0 and 5)
2016-10-18 11:25:36 +02:00
d5f82b568c
New data precision... (Init)
2016-10-18 10:32:10 +02:00
b81318180d
fixed url licensing.artica.es
...
(cherry picked from commit b972981e9a
2016-10-11 09:47:01 +02:00
2cb08b06b6
Added new feature to remove past special days.
2016-10-08 16:12:53 +09:00
94c026a796
Fixed problems in AD config. Ticket: #4053
...
(cherry picked from commit aa27d7a2b9
2016-10-05 10:43:15 +02:00
c8fe3b9268
Fixed problems with visual parts of auth menu. Ticket: #4053
2016-10-04 12:27:11 +02:00
359f0aaac1
add qr icon, separate menu bar, favicon and optional graph logo 46,64,45,80,55
2016-10-03 12:31:23 +02:00
78f5d79638
fix visual errors
2016-09-29 15:02:12 +02:00
b722e70620
Changes on enterpise alert icons, limit screens and favicons
2016-09-28 13:26:58 +02:00
22a4dbe67b
header logo and login logo limited for pandoraopen, module group aspect and update manager modal window. 64,63,59,48,61
...
modificacion de estilos de ventana modal y editor de usuarios
(cherry picked from commit 6f33c0eaf8d4ba681833
2016-09-26 11:46:41 +02:00
be3a520488
Add if use ssl cert and path of this cert. #5
2016-08-26 12:41:34 +02:00
2dffe9b1b8
Fixed token fontpath in windows. Ticket #3316 .
2016-08-23 11:56:09 +02:00
d1794b8385
ticket integria: 3897 add number agent disabled/enabled in license #27
2016-08-18 11:10:45 +02:00
6a5538346a
Added audit log. Tciket #3714 .
2016-07-05 16:53:40 +02:00
9a11ac5f9a
Label changed in setup_general. Ticket #3878 .
2016-07-04 15:59:41 +02:00
e9e5520ea9
Exclude disabled agents scheduled stops. Ticket #3878 .
2016-07-04 15:46:56 +02:00
7ca577ce51
Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490
2016-06-06 13:05:25 +02:00
8c30cbd756
Added AUTODISABLE mode to agents Tickets #3497
2016-06-03 11:58:13 +02:00
0acf4f41eb
New development. Display lateral menus whit left click.
2016-06-02 11:59:35 +02:00
225aef21ad
BIG_OPERATION_STEP, SMALL_OPERATION_STEP of pandora_db.pl to be configured through the Console. TICKET #3558 .
2016-05-27 16:37:58 +09:00
16454c30a1
Now the eHorusID custom field is created automatically when the feature is enabled
2016-05-09 19:22:10 +02:00
9e9c45d031
Minor text fix
2016-05-09 16:50:20 +02:00
853ef78168
Changed the temporal images of the menus for eHous with their definitive version
2016-05-09 16:31:29 +02:00
142d544ef1
Added a connection test with the eHorus API and custom fields management
2016-05-05 18:26:06 +02:00
e3cfca24ed
Added a setup section for ehorus
2016-05-04 19:19:07 +02:00
e97aff1cc4
Added report_limit token and functionality TICKETS #3577
2016-04-25 12:27:30 +02:00
744b60cbd1
Solved config token homedir_filetransfer duplication TICKETS #3475
2016-03-16 18:49:17 +01:00
e9eb16a848
Some changes in saml login system.
2016-02-18 12:29:50 +01:00
a3a38c9bb6
New login method (saml). Ticket#3393
2016-02-17 13:05:22 +01:00
ab64f9100c
Added the snmp editor for other data uses in the form wizard snmp. TICKET: #1805
2016-01-25 16:31:02 +01:00
f253a16d9b
Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170
2016-01-19 13:21:18 +01:00
ba492135ca
Added a new option to visual setup that configure the interface unit graphs. Ticket#2620
2015-10-23 12:54:58 +02:00
df9748712d
change input type of text a password. Tiquet: #2860
2015-10-19 16:12:56 +02:00
786cf45344
Updated update manager URLs.
2015-09-22 12:55:38 +02:00
67bbd20fef
Renamed 'DHPM' to 'Satellite'.
2015-09-22 12:55:38 +02:00
b4beb466a4
Added support for the new license format.
2015-09-22 12:55:38 +02:00
f8d508b9e1
Change visual option of custom report front to url dinamic, Tiquet: #2660
2015-09-01 12:50:09 +02:00
1dc46f6d67
Fixes to improve the compatibility with oracle
2015-08-31 17:51:59 +02:00
7da9cd812a
Starting to fix the themes. TICKET: #435
2015-08-19 14:44:25 +02:00
5dbb268250
Error fix
2015-08-13 14:33:21 +02:00
57d66bf073
Fixed some errors, improved the code and prepared for compatibility w/ the metaconsole
2015-08-13 10:59:38 +02:00
dfcfc85303
Add new funcionality of remote login with Active Directory
2015-07-28 16:10:45 +02:00
a316419afa
Add new options when render proc is active. Tiquet: #2503
2015-07-22 11:49:00 +02:00
c4d6c18b25
Fixed styles and errors of php
2015-07-14 15:59:39 +02:00
f6e9cf37b0
Fixed error styles
2015-07-07 16:05:23 +02:00
70db852326
Merge branch 'feature/NewView' into develop
2015-06-26 12:22:14 +02:00
ba091112f6
Change visual and login page
2015-06-26 12:21:25 +02:00
440687c0d7
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-06-26 11:46:58 +02:00
964b17644a
Change visual
2015-06-26 11:20:08 +02:00
7fac872fb8
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-25 16:17:32 +02:00
4e8c85ec10
Fixes to the 'key' column of the 'tupdate_settings' table
2015-06-25 16:16:01 +02:00
94c742bfbe
Merge from Develop
2015-06-25 10:40:35 +02:00
5b4214277b
Changed of visual
2015-06-25 10:07:53 +02:00
2754bfeeb0
Fixed inserts paths in DB. Tiquet: #2325
2015-06-22 10:30:57 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +02:00
9544dec1ac
Change visual of console
2015-06-15 15:50:28 +02:00
9789eca1e1
Added the feature to set module charts painting with lines or area. TICKET: #1849
2015-06-11 21:24:14 +02:00
37a7cf6cf2
Some fixes in the code.
2015-06-11 20:17:54 +02:00
a364542454
Sort and structure the code and result form with a huge fields of visual pandora setup.
2015-06-11 19:08:57 +02:00
7574f6ed09
Clean the source code style.
2015-06-08 13:13:09 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
33129d89ce
Instantiated an object (table) to avoid PHP warnings
2015-06-03 15:56:25 +02:00
6241ae13d6
Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996
2015-05-04 15:44:37 +02:00
a7f748b7be
Ticket #1354 .
2015-04-13 11:27:23 +02:00
e0e531bf05
Add field to custom line widht to custom graph tiquet: #1875
2015-03-17 15:36:24 +01:00
df651810d4
Added support for password encryption to the Pandora FMS Console.
2015-03-02 17:30:19 +01:00
7b08fb47c1
Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845
2015-02-26 12:27:18 +01:00
d636561383
Fixed PHP warning.
2015-02-26 10:09:16 +01:00
ff2a10a4e8
Visual fixes
2015-02-13 19:41:03 +01:00
12831ca3b1
Added a preview to the status sets
2015-02-13 19:32:34 +01:00
7c89c42709
Added a preview to the gis icons
2015-02-13 19:18:51 +01:00
45640c8c96
Fixed a visualization error
2015-02-13 18:59:31 +01:00
53ee72c74d
Added a preview button to the custom login background and header logo
2015-02-11 19:41:04 +01:00
2842970c83
Added feature of custom post process values. TICKET: #1743
2015-02-09 19:35:03 +01:00
7628ddb5c6
Set a data limit in the forms of massive operations. TICKET: #1700
2015-02-04 11:19:11 +01:00
9bed03aefd
Fixed PHP warnings.
2015-02-02 14:18:05 +01:00
33c6789144
Added an option to allow the users to enable the 2 step auth
2014-12-11 16:14:55 +01:00
bda09a22e1
Added in setup visual a check for to show the group as text. Ticket: #1501
2014-11-20 15:06:11 +01:00
bb05dfcd58
Fixed PHP warning about the unset 'server_log_dir'
2014-11-20 12:49:13 +01:00
e74d61bb1b
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop
2014-09-30 11:57:42 +02:00
3c4cc38c90
Removed old deprecated and commented/disabled code
2014-09-30 11:57:11 +02:00
b6e133b11b
Fixed the update manager URL
2014-09-29 14:14:39 +02:00
29eb11b696
Improved the items information of the module graphs
...
* pandora_console/godmode/setup/setup_visuals.php,
pandora_console/include/functions_config.php: Added a
new config token to choose if the module graphs
data should be shortened.
* pandora_console/include/functions_custom_graphs.php:
Added the unit list parameter to the function
"custom_graphs_print".
* pandora_console/operation/agentes/interface_traffic_graph_win.php:
Improved a function call.
* pandora_console/include/functions_graph.php: Modified
the function "graphic_combined_module". Now is
possible to add custom units for the items and
short the data.
2014-09-23 13:20:50 +02:00
eeb9725334
Merge branch 'feature/ticket#1243-PlannedDowntime' into develop
2014-09-22 11:48:22 +02:00
e9998e7bda
Remove 'sla_period'. Ticket #1282
2014-09-17 17:22:43 +02:00
f4ed2b8d6e
Do not delete not init modules by default.
...
An option has been added to the Pandora FMS Console Setup to enable the
deletion of these modules.
2014-09-17 14:13:51 +02:00
fbsanchez
Daniel Rodriguez
manuel
Luis Calvo
marcos.alconada
slerena
Daniel Barbero Martin
Ramon Novoa
Alejandro Gallardo Escobar
Tatiana Llorente
fermin831
Alejandro Fraguas
alejandro-campos
artica
vgilc
manuel.montes
samucarc
danielmaya
enriquecd
Arturo Gonzalez
Alejandro Gallardo Escobar
Hirofumi Kosaka
Junichi Satoh
m-lopez-f
mdtrooper