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

328 Commits

Author SHA1 Message Date
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
 2018-12-20 18:17:57 +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
vgilc b916bdbe3c Merge branch 'exit-after-location-header-fix' into 'develop' 
Added an exit after every declared Location header

See merge request artica/pandorafms!1988
 2018-11-30 12:51:59 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
Alejandro Gallardo Escobar 919e94e46a Added an exit after every Location header declared 2018-11-19 11:28:07 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
fermin831 06830c9f69 Added profiller to docker 2018-11-13 12:55:25 +01:00
fermin831 6ede68bf8d Fixed delete menu on main page dashboards 2018-11-06 13:10:44 +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
fermin831 2af6108b66 Removed dashboard menu if it is displayed from main page 2018-10-23 12:29:23 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +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 8e2f4b0eaa Implemented license validation for mobile console 2018-08-23 13:57:41 +02:00
fermin831 d8d18e422e Fixed ACL enterprise in home screen 2018-08-03 14:22:26 +02:00
samucarc ad7610d7f1 Removed html entities in the audit views 2018-07-24 15:02:11 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
fermin831 8fc8c25548 Fixed login query params deletion (now it does not delete) 2018-04-18 17:58:44 +02:00
enriquecd 18f3020785 Change fixed header and fixed menu positions - #1844 2018-02-28 19:02:54 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
enriquecd 412374ef25 Fix setting visual console as home screen - #1694 2018-01-12 11:06:42 +01:00
enriquecd 790b5b5da6 Redirect to real url when login - #1694 2017-12-14 12:11:49 +01:00
enriquecd b6b0c8532d Carrefour auto loginhash existing session - #1679 2017-12-11 16:30:09 +01:00
enriquecd abce89355d Insert password changes by recover mail in system audit log - #1329 2017-12-05 12:56:50 +01:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
daniel bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +02:00
vgilc 3ae20056fc Merge branch '990-advise-links-doesnt-work-in-open-version-dev' into 'develop' 
Changed bad ajax call

See merge request !562
 2017-06-14 11:05:38 +02:00
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00
Arturo Gonzalez d101d9abdc Changed bad ajax call 2017-06-07 11:28:09 +02:00
vgilc 149a77a559 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'" 
This reverts merge request !558
 2017-06-07 09:32:35 +02:00
vgilc c674892709 Revert "Merge branch 'fixed-errors-in-login' into 'develop'" 
This reverts merge request !559
 2017-06-07 09:31:46 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
daniel 5d3a0c4ab7 fixed errors in login page 2017-06-06 13:57:10 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev' 
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
 2017-05-23 09:50:22 +02:00
enriquecd 57393eb9cf Fix logout bad permission with myslq service stopped dialog - #825 2017-05-19 11:12:58 +02:00
Arturo Gonzalez 634db70812 Added second condirmation to user session 2017-05-08 12:11:51 +02:00
Arturo Gonzalez dba263632b Revert "Revert "Fixed license failure"" 
This reverts commit 55196854b0.
 2017-05-05 12:26:34 +02:00
Arturo Gonzalez 55196854b0 Revert "Fixed license failure" 
This reverts commit 14e7d4b448.
 2017-05-05 12:21:58 +02:00
Arturo Gonzalez 830ad6fc90 Revert "Revert "Fixed license failure"" 
This reverts commit 2b72053992.
 2017-05-05 12:17:25 +02:00
Arturo Gonzalez 2b72053992 Revert "Fixed license failure" 
This reverts commit 14e7d4b448.
 2017-05-05 12:14:17 +02:00
Daniel Maya 14e7d4b448 Fixed license failure 2017-04-27 10:49:54 +02:00
Arturo Gonzalez 5b015dbcb9 Added new icon to meta mail setup and change mail message 2017-04-20 16:11:45 +02:00
Arturo Gonzalez 14a3a79eb3 Changed cod type 2017-04-20 15:00:24 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez e26dfcd466 Move code to enterprise section 2017-04-20 11:18:43 +02:00