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

166 Commits

Author SHA1 Message Date
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
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