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

11725 Commits

Author SHA1 Message Date
Daniel Maya bed4f8e3d8 Fixed token fontpath in windows. Ticket #3316. 
(cherry picked from commit 2dffe9b1b8)
 2016-08-23 12:01:15 +02:00
Daniel Maya b52223a7ea Added new check to equalize maximum thresholds. Ticket #3732. 
(cherry picked from commit bb26f4b82d)

Conflicts:
	pandora_console/include/functions_graph.php
 2016-08-23 09:01:41 +02:00
artica 5d9609e34d Auto-updated build strings. 2016-08-23 00:01:51 +02:00
artica 35649a50c4 Auto-updated build strings. 2016-08-20 00:01:41 +02:00
daniel b51cb79178 ticket integria: 3897 add number agent disabled/enabled in license #27 
(cherry picked from commit d1794b8385)
 2016-08-18 11:18:40 +02:00
m-lopez-f f2918a2093 Fixed simple graph in custom report. Don't create a simple graph without avg 
(cherry picked from commit bf41048018)
 2016-08-18 10:29:28 +02:00
daniel 5b2530721e Ticket integria: 3909 fixed name export csv #26 
(cherry picked from commit 6a9fd3805a)
 2016-08-18 09:30:29 +02:00
artica e370bc8509 Auto-updated build strings. 2016-08-18 00:01:40 +02:00
m-lopez-f ff512260ad Fixed problems in DB Status, in information of sql statements. GitHub: #57 
(cherry picked from commit 07234fa087)
 2016-08-17 15:42:29 +02:00
m-lopez-f fa64072cfc Fixed problems with form in recon task. GitHub #59 
(cherry picked from commit 0367f88f56)
 2016-08-17 15:12:20 +02:00
axl89 107c734aee Modified create module test to adapt to new the changes 
(cherry picked from commit fb7d1894d4)
 2016-08-17 13:02:09 +02:00
m-lopez-f 6c27a6e16a Delete html tag. Tiquet: #3246 
(cherry picked from commit 8e7f2cdd90)
 2016-08-17 12:03:51 +02:00
m-lopez-f bc4011694a Fixed problems with search form in Policies form. Tiquet: #3246 
(cherry picked from commit f3478168a7)
 2016-08-17 11:59:45 +02:00
daniel 3bf5801d13 ticket integria: 3980 fixed error link recon_task IPAM #25 
(cherry picked from commit d855f72f59)
 2016-08-17 11:54:08 +02:00
m-lopez-f e0c3e04e03 Fixed problem with charge agents when select 'Agents firts in module bulk actions'. Tiquet: #3568 
(cherry picked from commit 77758f993a)
 2016-08-17 10:31:09 +02:00
axl89 cc6bcc50df Missing import 
(cherry picked from commit 68652ce584)
 2016-08-17 10:20:48 +02:00
axl89 4ba3bf8eb8 Now skipped tests are shown as Passed in Sauce Labs 
(cherry picked from commit 057fb1c9ba)
 2016-08-17 10:16:58 +02:00
artica cc2be5f697 Auto-updated build strings. 2016-08-17 00:01:31 +02:00
axl89 1f9d14878a Fixed build failures when tests are skipped 
(cherry picked from commit de484d8906)
 2016-08-16 20:42:12 +02:00
axl89 97bc93d563 Enterprise tests not run now count as 'skipped' instead of 'success' 
(cherry picked from commit 139fb60d84)
 2016-08-16 18:43:54 +02:00
cesar991 d0b32d8eb0 Moving forward to 2.0 Framework 2016-08-16 17:04:12 +02:00
axl89 d977a45c25 Fixed Collection tests being included as not Enterprise 2016-08-16 15:53:57 +02:00
daniel a311a060a1 ticket integria: 3981 fixed error in autentication active directory download collections #23 
(cherry picked from commit a38114ee65)
 2016-08-16 15:36:29 +02:00
cesar991 13f980bacb Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-08-16 15:05:01 +02:00
cesar991 bbe02ab8ff Moving forward to 2.0 Framework 2016-08-16 15:04:37 +02:00
m-lopez-f ec08ccd7c1 Fixed problems with html-labels and html editor in visual console. Tiquets: #3918 and #3985 2016-08-16 14:04:01 +02:00
m-lopez-f 25fedd8e84 Revert "Fixed problems qith html editor in textareas in visual console" 
Cause: https://www.tinymce.com/docs/plugins/bbcode/ and problems with labels in visual console.
This reverts commit 06e37132a8.
 2016-08-16 13:54:13 +02:00
cesar991 af5b3ec31f Started new transition to Framework 2.0 
(cherry picked from commit b9ea425590)
 2016-08-16 13:22:35 +02:00
m-lopez-f 2294d825e3 Fixed problems with parents lines objects. Tiquet: #3936 
(cherry picked from commit 0d8761d009)
 2016-08-16 12:16:50 +02:00
m-lopez-f 774b0f9cab Fixed problems with group agents. Tiquet: #3079 2016-08-16 10:43:29 +02:00
artica 65b3a1e73a Auto-updated build strings. 2016-08-16 00:02:18 +02:00
artica 6f0e9458cd Auto-updated build strings. 2016-08-15 00:01:35 +02:00
artica 6ad4cfa298 Auto-updated build strings. 2016-08-14 00:01:46 +02:00
artica 05bc394b24 Auto-updated build strings. 2016-08-13 00:01:42 +02:00
daniel 3a4826bb5f ticket integria: 3956 #22 
(cherry picked from commit 9ff35c28f3)
 2016-08-12 13:37:46 +02:00
axl89 689a867f3b Added default MYSQL_DATABASE environment variable 2016-08-12 13:02:57 +02:00
daniel 787e44e7f9 ticket integria: 3938 fixed error in report change max for min #20 
(cherry picked from commit c58bc9e365)
 2016-08-12 09:33:37 +02:00
Daniel Maya b49ccc5982 Added audit log. Tciket #3714. 
(cherry picked from commit 6a5538346a)

Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/functions_config.php
 2016-08-12 08:52:21 +02:00
artica d5b756cced Auto-updated build strings. 2016-08-12 00:01:34 +02:00
axl89 efa9105386 Added new Dockerfile for pandorafms-mysql image 2016-08-11 18:17:49 +02:00
daniel 78d87cc12b ticket integria: 3929 fixed pdf report graph repeat color for more 15 modules #19 
(cherry picked from commit 062aefeafc)
 2016-08-11 17:15:38 +02:00
Daniel Maya a7f16ea182 Fixed modules ordination. Ticket #3885. 
(cherry picked from commit 5928f22d8d)
 2016-08-11 11:56:49 +02:00
daniel 93b64ba43c fixed minor error in report #10 2016-08-11 10:04:10 +02:00
artica 9f0bdc5315 Auto-updated build strings. 2016-08-11 00:01:39 +02:00
axl89 772c6d4004 Fixed Policies test 
(cherry picked from commit 1de5e29b61)
 2016-08-10 15:20:18 +02:00
daniel 2804e59a73 N-ticket integria: 3909 fixed menu autohidden #16 
(cherry picked from commit 9ec8858e13)
 2016-08-10 11:34:26 +02:00
artica dc1824340d Auto-updated build strings. 2016-08-10 00:01:46 +02:00
Ramon Novoa abc0dcbbde Added an option to delay SNMP trap processing. 
(cherry picked from commit 00ba97f44b)
 2016-08-09 12:12:42 +02:00
axl89 c668f0b582 Moved develop branch tests to pandora_6.0 branch 2016-08-09 11:19:42 +02:00
fermin831 35f21def2c Fixed confilcts with onlyOneGroup 
(cherry picked from commit 6d2c1c126e)
 2016-08-09 10:23:58 +02:00