tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-14 14:28:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
24,691 Commits 34 Branches 30 Tags
Commit Graph

560 Commits

Author SHA1 Message Date
daniel
badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
daniel
89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
Junichi Satoh
5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
daniel
47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
daniel
a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
daniel
dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel
02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831
88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
daniel
16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +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
Alejandro Gallardo Escobar
37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel
78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel
b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel
79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
fermin831
614db8b523 [Rebranding] Added product name and copyright notice to setup 2018-05-09 11:49:12 +02:00
fermin831
57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
Alejandro Gallardo Escobar
f1985313ab The audit view and csv now use the user defined timezone 2018-05-07 16:10:31 +02:00
daniel
30dc841bae custom graph 2018-04-27 10:03:05 +02:00
daniel
2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel
e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
vgilc
778be05874 Merge branch 'ent-1902-sql-error' into 'develop' 
Elimina un error SQL al obtener noticias

See merge request artica/pandorafms!1415
 2018-04-17 16:22:44 +02:00
Alejandro Gallardo Escobar
d1608400f9 Avoid the news search for users without groups 2018-04-09 17:17:01 +02:00
fermin831
c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
daniel
d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel
688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
daniel
4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
daniel
b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
Ian Blenke
fbbc070b39 Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running() 2018-02-15 09:34:24 -05:00
daniel
74a8212032 fixed error show events 2018-02-09 14:20:49 +01:00
fbsanchez
571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +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
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
fbsanchez
2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
daniel
955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
daniel
a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
daniel
4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +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
Ramon Novoa
cea0f90117 Remove HTML entities from the SNMP community. 
Ref. pandora_enterprise#1565.
 2017-11-08 09:15:13 +01:00
Arturo Gonzalez
526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
Arturo Gonzalez
da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
daniel
d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez
0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez
bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
daniel
c29d8a4fdb Revert "merge develop" 
This reverts commit 823291171347bf74d93e74a99a3c958660a39fe2, reversing
changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb.
 2017-08-23 09:35:17 +02:00
vgilc
c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
Arturo Gonzalez
ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
daniel
20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
daniel
179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824ebe779b263852493d1e2a4144235b0.
 2017-07-28 12:46:17 +02:00