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

149 Commits

Author SHA1 Message Date
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria" 
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
 2018-12-10 13:42:29 +01:00
alejandro-campos dd1fb00e19 Revert "Removed html entities in the audit views" 
This reverts commit ad7610d7f1.


Former-commit-id: a2b1fb7e9f6032cc255abb42e8ef0d65efc877b6
 2018-12-10 13:40:37 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +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
vgilc b50f52ae9d Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
 2018-10-25 12:10:58 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
vgilc 4b583c7477 Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria' into 'develop' 
Removed html entities in the audit views

See merge request artica/pandorafms!1631
 2018-10-01 12:37:52 +02:00
alejandro-campos 93f4b74c9c fixed bug: admin users not able to log in to node when they are created in metaconsole and included option assigned node at admin user creation form 2018-09-26 18:48:27 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
samucarc ad7610d7f1 Removed html entities in the audit views 2018-07-24 15:02:11 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c3beafc499 [Rebranding] Open godmode/update_manager and godmode/users 2018-05-10 17:15:37 +02:00
fermin831 2cc1f04ced [Secondary groups] Modified configure user to manage secondary groups 2018-03-20 16:51:41 +01:00
enriquecd 75d48ef5fe Fix system log - #1571 2018-02-08 18:22:12 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
daniel bec91f39cc add new field external link login user 2017-12-14 13:28:46 +01:00
enriquecd abce89355d Insert password changes by recover mail in system audit log - #1329 2017-12-05 12:56:50 +01:00
vgilc 659d16d372 Merge branch '1329-Visualizar-auditoria-de-cambios-de-contraseña-4225' into 'develop' 
Audit password changes in system audit log - #1329

See merge request artica/pandorafms!932
 2017-11-29 16:03:20 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
daniel b23b9448b6 fixed errors in visual console 2017-10-24 17:03:35 +02:00
enriquecd 7786a6fbd5 Audit password changes in system audit log - #1329 2017-10-17 17:03:05 +02:00
Arturo Gonzalez 90012f43ff Checkbox removed 2017-05-29 15:29:41 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
Daniel Maya eb4b5b9f43 added home screen in the creation and modification of users 2017-04-06 16:17:54 +02:00
Arturo Gonzalez a6209c15ca Added event filter field to user in creation and edition 2017-04-05 17:44:24 +02:00
Arturo Gonzalez f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Arturo Gonzalez 751b73adcb Added session coocki to users. Ticket GitLab #120 2016-11-23 10:13:02 +01:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
m-lopez-f 3950c08587 Change help hint in Create user in field 'Global Profile' 
(cherry picked from commit 9e14c5fb20)
 2015-01-16 12:11:13 +01:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs" 
This reverts commit 3d251fd035.
 2015-01-15 15:11:26 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
alexhigh b93b4c35b3 2014-06-11 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* godmode/users/configure_user.php: Fixed some input
	properties.

	* include/graphs/functions_flot.php: Added an option
	to set the width to auto on the function "flot_vcolumn_chart".

	* include/graphs/flot/pandora.flot.js: Increased the tick size
	of the vertical labels on the function "pandoraFlotVBars".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-11 11:34:27 +00:00