efd8c8cab2
#8040 resolved conflict
2021-11-15 13:20:43 +01: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
56ae68a034
Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop'
...
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado
See merge request artica/pandorafms!4487
2021-11-03 09:34:49 +00: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
e7d730ba0d
fix bug with ldap login in metaconsole
2021-10-19 19:19:55 +02:00
f42e57efbe
show only events filter in acl groups
2021-10-06 17:11:45 +02:00
8c1838abb7
Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
...
Conflicts:
pandora_console/install.php
2021-09-29 13:47:10 +02:00
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
8eababe2f6
Autorefresh changes on centralized node and metaconsole
2021-09-22 17:29:14 +02:00
0778952461
Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen
2021-09-16 16:32:27 +02:00
4ff6b8a1bb
Re-enabled user management in MC while not in centralised environment
2021-08-23 12:29:17 +02:00
c44593be8a
Revomved autorefresh views than does not exists on meta
2021-07-06 10:14:59 +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
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00: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
ec6cb4d532
fix category, Os, tags, user_edit synch
2021-05-18 10:57:21 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
514a91c853
Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop'
...
Ent 6541 quitar id usuario url seccion usuario
Closes pandora_enterprise#6541
See merge request artica/pandorafms!3990
2021-05-10 09:08:59 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
ce5934b9a1
Added form-type buttons for user-actions
2021-05-06 14:46:58 +02:00
0dc1ec449c
Added standard headers
2021-04-30 14:44:03 +02:00
0500b90101
fixed visual error selects home view
2021-04-13 16:29:28 +02:00
87362d07f4
fixed visual error selects home view
2021-04-13 15:37:44 +02:00
4f803c8abb
fixed visual error selects home view
2021-04-13 13:23:22 +02:00
0308fdbdc2
Clean debug lines
2021-03-31 13:29:09 +02:00
01a037e2d3
Changed method of send id parameter
2021-03-31 13:27:58 +02:00
e8e9b61d32
fixed visual error
2021-03-17 16:44:57 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
51404eda8d
Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
...
Ent 7077 no funciona doble auth meta
See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
93a4a90dd6
Ent 7077 no funciona doble auth meta
2021-03-02 12:24:03 +00:00
0fb3ba9232
System status notifications filtered by subtype
2021-02-19 13:36:29 +01:00
02475d25b6
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
2020-12-23 06:48:22 +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
8aa18a1236
active user password check
2020-12-02 16:29:45 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
848f60229a
updates on 2FA all users feature
2020-10-06 17:02:58 +02:00
e5fe9d5c29
feature 2FA_all_users
2020-10-05 12:29:51 +02:00
b3cf532c16
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
2020-05-29 12:30:49 +02:00
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
e66f33fd37
WIP Cluster references updated
2020-05-22 12:14:01 +02:00
1f16abd4bd
Ent 5701 quitar feature de chat
2020-05-08 15:39:24 +02:00
2d48c67377
add modal on Webchat
2020-04-28 13:56:43 +02:00
bcc68c0034
add modal on Webchat
2020-04-28 13:42:27 +02:00
60c766ca29
minor visual changes on user notifications editor
2020-04-02 10:37:59 +02:00
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
45c57abb70
Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop'
...
Ent 4883 mensaje erroneo web chat
See merge request artica/pandorafms!2856
2019-12-23 17:45:25 +01:00
0490024abc
add sap view to autorefresh edit my user
2019-11-25 15:01:27 +01:00
e94d8726c7
Changed date in webchat
2019-11-04 13:59:30 +01:00
ca5a31db6a
Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop'
...
add gis maps to autorefresh list
See merge request artica/pandorafms!2731
2019-10-15 13:21:19 +02:00
53850a8c1f
add gis maps to autorefresh list
2019-09-16 15:51:04 +02:00
2538504036
chaged hint from home screen
2019-09-04 16:05:10 +02:00
f08b5204c7
Merge branch 'ent-3673-bug-webchat-consola' into 'develop'
...
Modified jquery window function
See merge request artica/pandorafms!2550
2019-07-18 12:50:56 +02:00
b7c662d3f9
Added session control for unexpected or forced logouts
2019-07-16 17:55:44 +02:00
bd070b706b
fixed minor error
2019-07-11 12:45:52 +02:00
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
0e1ad43422
Update webchat.php. Forgotten console log
2019-06-27 09:33:31 +02:00
77419ee709
Modified jquery window function
2019-06-27 09:05:22 +02:00
cdbd5b3487
Fixed bug in meta user_edir form url
2019-05-30 17:23:32 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
77dbb53db4
Fixed minor bug
2019-05-28 18:03:40 +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
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
4400d9303f
subscription manager udp
2019-05-23 19:22:05 +02:00
211b05c9d6
minor fix in newsletter logic
2019-05-23 18:59:38 +02:00
058c9d3806
Newsletter reminder settings ent
2019-05-23 18:54:04 +02:00
88234503c0
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
...
Fixed url in user_edit
See merge request artica/pandorafms!2436
2019-05-22 14:14:15 +02:00
edbde3fecb
Fixed url in user_edit
2019-05-21 17:14:29 +02:00
a0faffe161
Form eHorus user login with title
...
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
2019-05-16 18:59:17 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
0769c61b19
add map user edit
...
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +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
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
45c7bea6e6
Fixed a bug: show map image alternative when offline
...
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
2019-03-22 10:57:22 +01:00
151fe6ac78
Fixed a bug: show map image alternative when offline
...
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
b8f1b5f6a1
Fixed a bug: show popup double authentication
...
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
2019-03-21 15:58:10 +01:00
5d409cd778
New view user edit
...
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
bb7be444f4
Merge branch '3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo' into 'develop'
...
Fixed error user edit tocken filter events not set.
See merge request artica/pandorafms!2188
Former-commit-id: d293fbdebaf2a1300b4a2082c75d9b92c37cf87b
2019-02-21 09:49:47 +01:00
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
c16fb1696d
Merge branch 'develop' into 3222-Deshabilitar-doble-autenticacion-si-no-esta-activada
...
Former-commit-id: 6024bd09f1bb77c7610a8adbb72a92631ad6e59d
2019-02-15 15:03:42 +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
Daniel Maya
José González
Jose Gonzalez
Daniel Rodriguez
fbsanchez
alejandro.campos@artica.es
marcos
Calvo
Daniel Barbero Martin
Jose Gonzalez
Manuel Montes
Tatiana Llorente
Alejandro Fraguas