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

630 Commits

Author SHA1 Message Date
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09: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
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop' 
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
 2018-10-25 11:44:42 +02:00
vgilc d0e9875795 Merge branch '2846-Descuadre-en-Windows' into 'develop' 
Added class data to the table for last activity - #2846

See merge request artica/pandorafms!1818
 2018-10-25 11:23:45 +02:00
daniel d84427b014 fixed errors php 2018-10-15 10:32:24 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
tatiana.llorente@artica.es c4c0e89cbe Added class data to the table for last activity - #2846 2018-10-01 13:24:08 +02:00
danielmaya 329622d53c Added head search in acl enterprise 2018-09-24 10:25:10 +02:00
tatiana.llorente@artica.es 51af767549 Limited number of characters shown in the table - #2783 2018-09-21 09:21:21 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
manuel.montes 23b6dd5bdb Fixed menu with top property 2018-05-28 12:58:23 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
danielmaya ad7e8229ed Added check_login 2018-05-24 09:02:06 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
danielmaya d48aeb05bb Update HA. change of icon and text 2018-05-22 08:39:38 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Alejandro Gallardo Escobar cada865042 Fixed XSS vulnerability 2018-05-18 11:00:41 +02:00
fermin831 cb11f0333e [Rebranding] Open general/firts_task/incidents.php 2018-05-14 16:06:32 +02:00
Alejandro Gallardo Escobar 6bc8cee237 Added the user defined timezone to some dates 2018-05-10 11:43:03 +02:00
fermin831 33abfa7f9d [Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php 2018-05-09 18:50:45 +02:00
fermin831 b9504038fa [Rebranding] First tasks 2018-05-09 15:16:39 +02:00
fermin831 a3ebd00876 [Rebranding] Node setup and footer 2018-05-09 13:12:03 +02:00
danielmaya 475d243224 Added master creation in ha_cluster 2018-05-07 13:21:06 +02:00
enriquecd 4378dc48ad Fix cluster ACL - #1878 2018-03-28 18:37:59 +02:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
enriquecd 88fddf3032 Add permissions - #1748 2018-02-01 17:49:37 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00