cd2f3b8a54
Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop'
...
Ent 8098 bug en filtro de agents/alerts
See merge request artica/pandorafms!4470
2021-11-15 11:18:27 +00:00
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
a5bf72cca0
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
24e73ce420
fix count in module groups view
2021-10-26 12:57:01 +02:00
a300ca5786
#8098 Fixed pagination
2021-10-14 11:33:06 +02:00
086761b7b6
Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop'
...
fixed visual error with modules agents
See merge request artica/pandorafms!4390
2021-10-05 09:22:05 +00:00
d0e738e8fb
Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop'
...
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola
See merge request artica/pandorafms!4409
2021-10-05 09:18:41 +00:00
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
b332e59687
fixed minnor error with resource library url
2021-09-27 13:48:07 +02:00
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
1b4a137579
fixed visual error with modules agents
2021-09-06 17:16:49 +02:00
cdc8b0a80c
Merge branch 'ent-7676-12038-error-en-users-connected' into 'develop'
...
fixed sql error without profile
See merge request artica/pandorafms!4200
2021-08-03 06:48:56 +00:00
9b736d0c48
Deleted and reubicated acl options
2021-07-30 13:49:22 +02:00
eec373e896
Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url
2021-06-24 19:48:07 +02:00
64dd4f2c2b
Wip command center, Plugins in meta
2021-06-15 17:24:03 +02:00
0521ffb7bf
fixed sql error without profile
2021-06-14 14:46:41 +02:00
afa1eef63c
fixed sql error without profile
2021-06-14 14:10:16 +02:00
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
12e67380ee
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-28 14:37:20 +02:00
84902a5d3d
Fixed code
2021-05-28 13:20:16 +02:00
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
76628117fa
Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'
...
# Conflicts:
# pandora_console/operation/messages/message_edit.php
2021-05-25 13:50:17 +00:00
6c305833bf
fix groups, module_groups, network_components user_edit synch
2021-05-18 17:18:54 +02:00
f8eafa5015
fixed visual error on snmp interfaces agent graphs black theme
2021-05-12 12:52:44 +00:00
9ab027b286
WIP: Upload
2021-04-29 13:28:03 +02:00
7b9c638f0d
Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop'
...
Fix reource registraton error 500 on empty or bad ptr file
See merge request artica/pandorafms!4051
2021-04-27 11:48:17 +00:00
1c8e73df9d
fixed count in several views
2021-04-21 17:11:32 +02:00
888915a1c1
Fix reource registraton error 500 on empty or bad ptr file
2021-04-21 17:04:11 +02:00
ec4f23e502
fixed visual error
2021-03-25 14:36:51 +01:00
5b1517f767
Merge
2021-03-12 11:07:44 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
69e1f1fb33
Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
# pandora_console/include/styles/pandora.css
2021-03-09 14:39:15 +00:00
66e4e2b173
Merge branch 'develop' into 'ent-6848-Varios-bugs-en-la-vista-Connected-users'
...
# Conflicts:
# pandora_console/extensions/users_connected.php
2021-03-02 16:34:10 +00:00
29913883ae
Fixed connected users seeing all users
2021-01-26 13:35:46 +01:00
64ec705f2c
Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop'
...
allowing self signed certs for quickshell
See merge request artica/pandorafms!3625
2021-01-25 09:26:04 +01:00
1fc1752b01
Solved merge
2021-01-12 13:26:48 +01:00
86794af7b4
Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop'
...
Removed ip from connected user list
See merge request artica/pandorafms!3741
2021-01-11 18:11:28 +01:00
2a2e63fedb
Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop'
...
Fix firefox double load of quickshell
See merge request artica/pandorafms!3686
2021-01-04 11:15:26 +01:00
69c33b45fa
Removed ip from connected user list
2020-12-23 14:33:20 +01:00
5f0d686034
Changed Network Tools for External Tools
2020-12-18 12:31:44 +01:00
7a74ae4d20
changes in connected users view
2020-12-15 17:40:15 +01:00
623b729001
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
e501b018e4
Fix firefox double load of quickshell
2020-12-02 13:42:23 +01:00
35bfd765f3
fix SNMP v3 show realtime charts
2020-11-30 14:26:49 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
8471f170fb
Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
...
Fix
See merge request artica/pandorafms!3652
2020-11-25 14:40:38 +01:00
7187c54730
Fix
2020-11-25 14:33:52 +01:00
b1fd90ae58
Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
...
Ent 6542 agents alerts view fallos visuales
Closes pandora_enterprise#6542
See merge request artica/pandorafms!3594
2020-11-25 13:35:17 +01:00
f081a6e376
Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
...
Merge with last updates
2020-11-23 10:08:16 +01:00
32dcd8a7ca
Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
...
# Conflicts:
# pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
ea346afcc5
allowing self signed certs for quickshell
2020-11-17 17:06:36 +01:00
d172aad1d2
Fix error with category
2020-11-10 16:51:28 +01:00
702b5025e9
Ended development
2020-11-10 16:48:09 +01:00
f501d19539
Solved issue with main view
2020-11-10 10:58:06 +01:00
b5dc75ce93
WIP: Backup upload
2020-11-04 16:40:18 +01:00
2063849dd0
Merge branch 'ent-6569-Exportado/importado-de-informes' into 'develop'
...
fix exportation/exportation
See merge request artica/pandorafms!3563
2020-10-30 13:29:04 +01:00
83233b6192
Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
...
groups_get_children and propagate update
See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
bebac548d3
fix exportation/exportation
2020-10-23 10:47:03 +02:00
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
0f379a2888
Fixed pagination counter
2020-10-20 12:38:42 +02:00
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
ea3f147bad
minor fixes group selector
2020-10-02 14:31:41 +02:00
0db539c444
fix visual windows charts
2020-10-01 15:29:54 +02:00
5d63bc547e
Group selection review
2020-09-29 14:22:58 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
9d0becc012
Added other password fields
2020-09-29 10:12:49 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
f7fe604914
Fixed entities in resource exporting
2020-08-28 14:43:20 +02:00
1adcce21af
Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop'
...
fix broken snmp modules real time graphs when community string has certain chars
See merge request artica/pandorafms!3131
2020-06-26 13:28:04 +02:00
1243968872
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:12:52 +02:00
ab61cf1fc5
changed console and audit log locations
2020-06-08 10:48:48 +02:00
bf66724c9f
Merge branch 'ent-5217-websocket-settings-en-open-no-funciona-bien' into 'develop'
...
Form fixes
See merge request artica/pandorafms!3242
2020-06-08 10:16:58 +02:00
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
fae026a089
Form fixes
2020-05-26 13:48:43 +02:00
2ca9e6fb4a
1st approach avoid quick_shell vulnerability (telnet)
2020-04-17 11:18:49 +02:00
a12851d0a2
fix broken snmp modules real time graphs when community string has certain chars
2020-04-01 16:37:30 +02:00
674f2a2873
minor fix: data string not being displayed correctly when module unknown
2020-02-03 18:04:52 +01:00
d05551f85a
fix characters breaking html
2020-02-03 16:17:46 +01:00
3d0b71d953
Added enconding to POST variables
2020-01-21 11:05:49 +01:00
ffce6399b0
Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
...
Secured get_file script for unauthorized file download
See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
1cef8aa62f
Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
...
Changed the mode of obtain the title
See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
f6163f4f80
Secured get_file script for unauthorized file download
2020-01-07 17:31:14 +01:00
2c37ef4acb
dbmanager blankspaces transparent to user
2019-12-20 14:18:48 +01:00
4631d9ea64
minor style fix
2019-12-16 16:48:29 +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
a799b22a5c
Fixed bug in network tools
2019-11-27 14:06:52 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
15aaf0cae6
Added acl checks to module groups view
2019-11-18 17:18:40 +01:00
1a7165f751
allow to remove user/pass from quick_shell configuration
2019-11-12 13:19:03 +01:00
e583b71a99
missaligned tips
2019-11-05 11:51:26 +01:00
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
6478c7a51f
minor tips quickshell
2019-10-29 15:55:39 +01:00
06c7544041
minor fixes
2019-10-29 15:44:46 +01:00
c4c7d916e7
Applying of better way for save config
2019-10-24 17:21:21 +02:00
b0db7c729d
Solved minor issues
2019-10-24 16:23:58 +02:00
742329336e
Added link with visual consoles
2019-10-24 14:30:34 +02:00
045d42d2bb
quickShell auth
2019-10-24 12:05:00 +02:00
29bcd379f7
Added changes for liking with visual consoles
2019-10-24 11:53:35 +02:00
df576a3b86
ws gotty credentials and ws gotty proxy redirection
2019-10-24 10:59:08 +02:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
0d67d23cb6
quickShell support for ws_proxy_url
2019-10-23 19:19:38 +02:00
66ceb93d04
minor changes and init.d script for websocket engine
2019-10-23 15:23:21 +02:00
c963681098
Quick shell telnet improvements
2019-10-21 21:10:26 +02:00
9d8bb880fa
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:50 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
e24024d2f4
WS gotty extension - global
2019-10-17 15:31:17 +02:00
4cceb38762
1st RC WebSocketProxy
2019-10-15 22:16:54 +02:00
06f8f920b8
wip WS redirection
2019-10-15 17:20:23 +02:00
3a9e5fa477
wip: gotty redirection experiment p2
2019-10-14 19:33:00 +02:00
86170b3ad8
experiments
2019-10-14 07:59:29 +02:00
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
d7ca703c99
Cleaned the javascript call
2019-09-20 10:53:09 +02:00
914ac28151
Changed checkboxes for combo multiselect in File repository manager
2019-09-03 12:59:24 +02:00
eaf29b798a
Fixed minor visual bugs in black theme- #4194
2019-07-09 15:03:38 +02:00
39ac83ae5e
Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'
...
Style changes - #4250
See merge request artica/pandorafms!2557
2019-07-01 10:02:02 +02:00
47838a1134
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
...
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
2019-07-01 09:48:33 +02:00
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
fc0d9463d5
Fixed
2019-06-25 12:07:56 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
46f64f75c8
Fixed autorefresh in full screen - #3739
2019-06-18 14:54:40 +02:00
9bdf048fae
Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers
2019-06-17 16:39:27 +02:00
08c035a612
Refactorf SNMPBrowserWndow in one unique function
2019-06-17 16:33:57 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
021ae9b1cd
Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop'
...
Ticket Resolved
See merge request artica/pandorafms!2227
2019-06-07 09:48:51 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
cc43e40694
Merge branch 'develop' into ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco
...
Conflicts:
pandora_console/extensions/agents_modules.php
2019-06-05 08:47:16 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +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
f807c23df7
Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop'
...
Fixed policy import with centralized management in node
See merge request artica/pandorafms!2217
Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
2019-05-14 16:50:42 +02:00
26bc3af1d1
Fixed centralized mode message
2019-05-14 15:16:24 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
05261e7924
Changed styles from table database interface - #3904
...
Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
2019-04-17 11:49:49 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +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
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
Daniel Rodriguez
José González
Jose Gonzalez
fbsanchez
alejandro.campos@artica.es
Daniel Maya
Jose Gonzalez
marcos
Calvo
Daniel Barbero Martin
manuel.montes
Alejandro Fraguas
Tatiana Llorente