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

379 Commits

Author SHA1 Message Date
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 8232911713, reversing
changes made to f5da86ac0a.
 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 78bb583824.
 2017-07-28 12:46:17 +02:00
enriquecd 78bb583824 Use session and not exec sql if already exists acl perms in session - #1017 2017-06-28 11:31:45 +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
Arturo Gonzalez b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez 87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez 4a4f52c459 Added send mail function 2017-04-19 17:29:22 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 5a612b3ab6 Added check to PNG extensions. Ticket #51 2017-03-06 15:32:24 +01:00
Junichi Satoh 023f4b1703 Fixed setcookie() usage. 2017-02-27 13:45:45 +09:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
Arturo Gonzalez 0e179a1725 Added "G" in srtftime format from date format. Ticket #241 2017-02-09 12:19:59 +01:00
daniel e9fc39b53b add percentil dinamic ticket: 4262 2016-12-23 09:36:44 +01:00
Junichi Satoh 85475bd6cc Fixed that exported csv file of audit log contains unnecessary data. 2016-12-08 09:35:34 +09:00
Arturo Gonzalez bba75aa166 Now non decimal numbers have all right zeros. Ticket #4254 2016-12-01 08:55:44 +01:00
Junichi Satoh 70f609b204 Fixed timestamp text corruption when language setting is Japanese. 2016-11-24 11:38:28 +09:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557" 
This reverts commit e7021d8a0f.
 2016-11-18 13:01:13 +01:00
m-lopez-f 0b5d8831df Fixed problems with data in visual console. Ticket: #4181 
(cherry picked from commit b8a0a542f2)
 2016-11-15 10:56:20 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
m-lopez-f 287c2a7477 Feature: Translate timestick of snmps to humen readable. Ticket: #2494 2016-10-26 16:17:02 +02:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
fbsanchez 43ad1c0f55 Minor fix 2016-10-14 11:54:24 +02:00
fbsanchez 2513dea2b5 Added switch to image content 
(cherry picked from commit d0a83b5021)
 2016-10-14 11:44:36 +02:00
fermin831 6d2c1c126e Fixed confilcts with onlyOneGroup 2016-08-09 10:22:54 +02:00