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
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
ac6b74dcdf
Added new window to display user notifications config
...
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
752186cfba
conflict solved
...
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
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
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
85adf7cf8d
Display an error message when no changes have been made - #2900
2018-11-08 12:04:08 +01:00
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
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
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
b9112541fb
Tip added - #2906
2018-10-23 13:56:27 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
525caee909
Fixed a minor mistake in error message - #2900
2018-10-17 12:59:37 +02:00
0b22ab6bfd
Minor bug fixed - #2900
2018-10-17 12:57:02 +02:00
561bce71ce
Changed error and success messages - #2900
2018-10-17 12:49:11 +02:00
7e4ca193cf
Countdown in group view for autorefresh
2018-09-14 14:19:49 +02:00
764b1125bd
Generate session csrf code to avoid attacks in user edition
2018-09-13 15:19:08 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
ed18d58676
[Rebranding] Open operation/*
2018-05-14 15:52:51 +02:00
26338dab4f
Add timezone selection to the user profile
2018-04-30 15:34:46 +02:00
dc5a8b8425
Fixed refresh in metaconsole
2018-03-06 13:13:40 +01:00
1f47f2f1a9
Added refresh in cluster_view
2018-02-02 11:49:53 +01:00
3c1025a146
Changes visual style in cluster map and added autorefresh
2018-01-31 16:40:38 +01:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
e86c87d23b
Added refresh by user
2017-06-21 13:50:05 +02:00
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
0fb02ff27a
Fixed networkmap path in auto-refresh white list
2017-05-10 10:01:23 +02:00
87f3798499
Added dashboards to "edit my user" section
2017-04-20 17:36:26 +02:00
2ca6783278
Align home screen and skin inputs in user editor - #82
2017-03-01 16:36:36 +01:00
543fd0c7ea
delete shortcut bar
2017-02-03 12:23:58 +01:00
2ec40a7f10
Redesing user edit view with percent size and 1024 compatible #50
2016-10-28 16:35:54 +02:00
6f33c0eaf8
modificacion de estilos de ventana modal y editor de usuarios
2016-09-22 11:17:32 +02:00
a051243b64
GUI improvement, add enterprise edition popup - ticket gitlab 49/68
2016-09-19 16:20:18 +02:00
b5854712bd
Added autorefresh list in user settings. Ticket #3931 .
2016-09-05 10:31:43 +02:00
58f0ccae77
Added default event filter. Ticket #3930 .
2016-08-31 11:13:37 +02:00
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
fcafb16648
Added connection with update manager and some design changes
...
Conflicts:
pandora_console/index.php
2016-06-16 13:02:29 +02:00
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
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
994f1a39b6
fixed problems php
2015-07-15 08:49:16 +02:00
c4d6c18b25
Fixed styles and errors of php
2015-07-14 15:59:39 +02:00
fbsanchez
Alejandro Fraguas
daniel
alejandro-campos
fermin831
artica
vgilc
tatiana.llorente@artica.es
Alejandro Gallardo Escobar
danielmaya
Arturo Gonzalez
enriquecd
m-lopez-f