Jose Gonzalez
b7c662d3f9
Added session control for unexpected or forced logouts
2019-07-16 17:55:44 +02:00
Daniel Barbero Martin
bd070b706b
fixed minor error
2019-07-11 12:45:52 +02:00
Tatiana Llorente
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
Jose Gonzalez
0e1ad43422
Update webchat.php. Forgotten console log
2019-06-27 09:33:31 +02:00
Jose Gonzalez
77419ee709
Modified jquery window function
2019-06-27 09:05:22 +02:00
Luis Calvo
cdbd5b3487
Fixed bug in meta user_edir form url
2019-05-30 17:23:32 +02:00
fbsanchez
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +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
fbsanchez
5be124f315
Styles review
2019-05-27 19:00:48 +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
Alejandro Fraguas
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
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
Daniel Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53: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
Tatiana Llorente
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
Tatiana Llorente
45c7bea6e6
Fixed a bug: show map image alternative when offline
...
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
2019-03-22 10:57:22 +01:00
Tatiana Llorente
151fe6ac78
Fixed a bug: show map image alternative when offline
...
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
Tatiana Llorente
b8f1b5f6a1
Fixed a bug: show popup double authentication
...
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
2019-03-21 15:58:10 +01:00
Tatiana Llorente
5d409cd778
New view user edit
...
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
Tatiana Llorente
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
Tatiana Llorente
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
Tatiana Llorente
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
Tatiana Llorente
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
fbsanchez
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +01:00
fbsanchez
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Alejandro Fraguas
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
daniel
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
fbsanchez
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
alejandro-campos
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
fbsanchez
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
fbsanchez
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
fermin831
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
fermin831
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
fermin831
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
fermin831
ac6b74dcdf
Added new window to display user notifications config
...
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
alejandro-campos
752186cfba
conflict solved
...
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
alejandro-campos
0670eb0d29
disable double authentication option on user edit when disabled in authentication setup
...
Former-commit-id: 3718da22ded115ae7de492ffbd200d972704865f
2018-12-10 11:04:21 +01:00
vgilc
5754674212
Merge branch '2906-TIP-para-Time-autorefresh-de-Edit-my-user' into 'develop'
...
Tip added - #2906
See merge request artica/pandorafms!1882
2018-11-30 13:09:34 +01:00
tatiana.llorente@artica.es
85adf7cf8d
Display an error message when no changes have been made - #2900
2018-11-08 12:04:08 +01:00
alejandro-campos
4179c0d341
fixed user edit update bug: not able to empty email and phone number fields and console errors. Also added validation to email and phone number inputs
2018-11-08 10:20:22 +01:00
vgilc
eec3b1843d
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop'
...
2900 mensajes de error y success al mismo tiempo en la edición de usuarios
See merge request artica/pandorafms!1863
2018-11-06 17:08:54 +01:00
daniel
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
tatiana.llorente@artica.es
b9112541fb
Tip added - #2906
2018-10-23 13:56:27 +02:00
daniel
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
tatiana.llorente@artica.es
525caee909
Fixed a minor mistake in error message - #2900
2018-10-17 12:59:37 +02:00
tatiana.llorente@artica.es
0b22ab6bfd
Minor bug fixed - #2900
2018-10-17 12:57:02 +02:00
tatiana.llorente@artica.es
561bce71ce
Changed error and success messages - #2900
2018-10-17 12:49:11 +02:00
tatiana.llorente@artica.es
7e4ca193cf
Countdown in group view for autorefresh
2018-09-14 14:19:49 +02:00
fermin831
764b1125bd
Generate session csrf code to avoid attacks in user edition
2018-09-13 15:19:08 +02:00
Alejandro Gallardo Escobar
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fermin831
ed18d58676
[Rebranding] Open operation/*
2018-05-14 15:52:51 +02:00
Alejandro Gallardo Escobar
26338dab4f
Add timezone selection to the user profile
2018-04-30 15:34:46 +02:00
danielmaya
dc5a8b8425
Fixed refresh in metaconsole
2018-03-06 13:13:40 +01:00
danielmaya
1f47f2f1a9
Added refresh in cluster_view
2018-02-02 11:49:53 +01:00
danielmaya
3c1025a146
Changes visual style in cluster map and added autorefresh
2018-01-31 16:40:38 +01:00
Daniel Maya
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
Arturo Gonzalez
e86c87d23b
Added refresh by user
2017-06-21 13:50:05 +02:00
vgilc
c66810afea
Merge branch '847-networkmap-autorefresh-dev' into 'develop'
...
Fixed networkmap path in auto-refresh white list
See merge request !452
2017-05-31 17:09:00 +02:00
Arturo Gonzalez
0fb02ff27a
Fixed networkmap path in auto-refresh white list
2017-05-10 10:01:23 +02:00
Arturo Gonzalez
87f3798499
Added dashboards to "edit my user" section
2017-04-20 17:36:26 +02:00
enriquecd
2ca6783278
Align home screen and skin inputs in user editor - #82
2017-03-01 16:36:36 +01:00
daniel
543fd0c7ea
delete shortcut bar
2017-02-03 12:23:58 +01:00
enriquecd
2ec40a7f10
Redesing user edit view with percent size and 1024 compatible #50
2016-10-28 16:35:54 +02:00
enriquecd
6f33c0eaf8
modificacion de estilos de ventana modal y editor de usuarios
2016-09-22 11:17:32 +02:00
enriquecd
a051243b64
GUI improvement, add enterprise edition popup - ticket gitlab 49/68
2016-09-19 16:20:18 +02:00
Daniel Maya
b5854712bd
Added autorefresh list in user settings. Ticket #3931 .
2016-09-05 10:31:43 +02:00
Daniel Maya
58f0ccae77
Added default event filter. Ticket #3930 .
2016-08-31 11:13:37 +02:00
fermin831
210c7c7d40
Definitive messages to update manager and solved some issues.
...
Conflicts:
pandora_console/godmode/update_manager/update_manager.setup.php
2016-06-16 13:12:05 +02:00
fermin831
fcafb16648
Added connection with update manager and some design changes
...
Conflicts:
pandora_console/index.php
2016-06-16 13:02:29 +02:00
fermin831
dbde4ffc43
Added dummy and undesigned identification wizard
...
Conflicts:
pandora_console/godmode/update_manager/update_manager.setup.php
pandora_console/include/functions_config.php
pandora_console/index.php
2016-06-16 12:59:11 +02:00
m-lopez-f
bc54629604
Fixed problems with user edit when change language,see all fields in home screen. Tiquet: #2448
2015-07-15 15:08:14 +02:00
m-lopez-f
994f1a39b6
fixed problems php
2015-07-15 08:49:16 +02:00
m-lopez-f
c4d6c18b25
Fixed styles and errors of php
2015-07-14 15:59:39 +02:00
m-lopez-f
d7bd4773db
Change visual of metaconsole
2015-07-02 08:54:21 +02:00
m-lopez-f
03b617908b
Change visual of metaconsole
2015-07-01 17:05:53 +02:00
m-lopez-f
5b4214277b
Changed of visual
2015-06-25 10:07:53 +02:00
m-lopez-f
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +02:00
m-lopez-f
9e528d0459
Change visual of console
2015-06-12 15:50:46 +02:00
mdtrooper
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
m-lopez-f
6b974efe19
Merge branch 'feature/NewView' into develop
2015-05-04 15:45:34 +02:00
m-lopez-f
40a9958905
Delete option, in home screen, only in insterprise servers. Tiquet: #2128
...
(cherry picked from commit c3b60812e0
)
2015-04-30 08:49:41 +02:00
m-lopez-f
d14359d3b4
change visual of this views
2015-04-27 10:11:56 +02:00
m-lopez-f
21f04e6a3a
Update maxlenght to password field in use detail editor, tiquet: #2098
2015-04-14 08:37:11 +02:00
m-lopez-f
912462c71a
Solvented visualization of group in few views, tiquet: #1946
2015-03-18 11:46:27 +01:00