7701ff7ad1
Resolve conflicts
2020-01-08 15:44:59 +01:00
eb222cc82f
Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido
...
Conflicts:
pandora_console/godmode/setup/setup.php
2020-01-08 15:41:45 +01:00
0468c85a4d
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
7c952eaaa8
changes visual setup
2020-01-07 10:56:37 +01:00
4cd1ca38a4
Ent 5091 unificacion de tamaño de letra en informes
2020-01-07 09:25:31 +01:00
168dfcf32d
minnor error
2019-12-17 15:23:01 +01:00
eca876212c
Ent 5095 visualizacion formato de fechas
2019-12-17 12:15:51 +01:00
24838cad0f
Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop'
...
Added compact mode to show timestamp - #4233
See merge request artica/pandorafms!2688
2019-12-16 11:48:09 +01:00
b71752ea03
Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop
2019-12-16 11:23:06 +01:00
b38c396837
Change date in hover in compact mode
2019-12-13 13:40:19 +01:00
a558152cb2
minor fix
2019-12-13 13:20:44 +01:00
ad6ea431bf
minor fix, hide quickshell settings while disabled
2019-12-13 13:13:09 +01:00
bd1954ce38
Setup Websocket engine, unified
2019-12-13 13:11:38 +01:00
3b5ebd0bf7
Better quickshell integration and fixes
2019-12-13 11:46:44 +01:00
a364af3b2d
Grouped report items on styles conf. Fixed font bug
2019-12-11 18:32:49 +01:00
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
898945d47f
Added icon for gis maps connections in tabs of setup
2019-10-29 13:26:36 +01:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
84ae4a8391
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
409ac061e0
Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
...
Ent 4047 simplificacion de la configuracion del sistema de email
See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
1177cce25f
added attached files section to incident edition
2019-09-19 10:24:43 +02:00
73a341912f
Changed caption Expires
2019-09-18 13:35:11 +02:00
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
2218ad7d60
Added email check functionality
2019-09-12 15:37:16 +02:00
4722d4a08b
changed setup option text
2019-09-10 11:38:02 +02:00
93b9c76f58
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
2019-09-10 10:50:53 +02:00
c2e47e0ffa
Revert "ddded comment"
...
This reverts commit 4ec832f523
2019-09-10 10:06:33 +02:00
4ec832f523
ddded comment
2019-09-10 10:03:30 +02:00
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
8fd1f3c99e
Added compact mode to show timestamp - #4233
2019-08-29 10:07:50 +02:00
97353bbfed
backup changes
2019-08-08 13:36:12 +02:00
9b8e3c540c
created integria integration setup
2019-08-05 13:42:01 +02:00
bfc267691b
Merge branch 'ent-3105-comportamiento-public_url' into 'develop'
...
Ent 3105 comportamiento public url
See merge request artica/pandorafms!2568
2019-07-12 13:02:42 +02:00
c386a29b80
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
2019-07-12 09:38:28 +02:00
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
0f280494a0
Changed images for divs to show preview in visual styles - #4195
2019-07-09 09:33:49 +02:00
eb01e9baaf
public_url with force option
2019-07-02 14:17:53 +02:00
0ea5b7ff1b
Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop'
...
Removed option to show qr code in header - #4196
See merge request artica/pandorafms!2494
2019-06-26 12:04:00 +02:00
8f2feac676
Added DESTDIR in license.php
2019-06-18 11:35:59 +02:00
e4139874dd
Removed option to show qr code in header - #4196
2019-06-11 18:00:41 +02:00
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +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
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
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
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +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
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
Tatiana Llorente
Alejandro Campos
marcos
Daniel Rodriguez
artica
fbsanchez
Luis Calvo
daniel
Jose Gonzalez
Alejandro Fraguas
Daniel Maya
Alejandro Gallardo Escobar
manuel
slerena
Ramon Novoa
fermin831
artica
vgilc
manuel.montes
samucarc