tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,549 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

199 Commits

Author SHA1 Message Date
fbsanchez 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
José González 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
Alejandro Campos 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
Daniel Rodriguez 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
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
José González 0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
marcos 0500b90101 fixed visual error selects home view 2021-04-13 16:29:28 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
marcos 4f803c8abb fixed visual error selects home view 2021-04-13 13:23:22 +02:00
Jose Gonzalez 0308fdbdc2 Clean debug lines 2021-03-31 13:29:09 +02:00
Jose Gonzalez 01a037e2d3 Changed method of send id parameter 2021-03-31 13:27:58 +02:00
marcos e8e9b61d32 fixed visual error 2021-03-17 16:44:57 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
José González 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
José González 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
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
marcos 0490024abc add sap view to autorefresh edit my user 2019-11-25 15:01:27 +01:00
Alejandro Fraguas 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
marcos.alconada 53850a8c1f add gis maps to autorefresh list 2019-09-16 15:51:04 +02:00
marcos.alconada 2538504036 chaged hint from home screen 2019-09-04 16:05:10 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
Luis Calvo cdbd5b3487 Fixed bug in meta user_edir form url 2019-05-30 17:23:32 +02:00
Luis Calvo 77dbb53db4 Fixed minor bug 2019-05-28 18:03:40 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez 4400d9303f subscription manager udp 2019-05-23 19:22:05 +02:00
fbsanchez 211b05c9d6 minor fix in newsletter logic 2019-05-23 18:59:38 +02:00
fbsanchez 058c9d3806 Newsletter reminder settings ent 2019-05-23 18:54:04 +02:00
Daniel Maya edbde3fecb Fixed url in user_edit 2019-05-21 17:14:29 +02:00
Luis Calvo a0faffe161 Form eHorus user login with title 
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
 2019-05-16 18:59:17 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
Alejandro Fraguas 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
Daniel Barbero Martin 26d5060232 fixed errors css 
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
 2019-04-12 10:10:04 +02:00
Tatiana Llorente 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
Daniel Barbero Martin 0769c61b19 add map user edit 
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
 2019-04-09 18:18:10 +02:00
Tatiana Llorente 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
Daniel Maya faecabb1cc Fixed problem with openlayer 
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
 2019-04-03 12:54:36 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00