9415 Commits

Author SHA1 Message Date
Arturo Gonzalez Diaz
d8e65e7595 Now when don't creates manage recontask, comes back to the creation page with the anterior values. Ticket #2543 2015-08-18 17:05:31 +02:00
mdtrooper
a18484ffa2 Fixed the javascript to load local components of type string and with empty strings in critical and warnings. TICKET: #2584 2015-08-18 16:02:45 +02:00
Arturo Gonzalez Diaz
bc4b72f455 Fixed bug that not show the module value in simple value (visual console). Ticket#2538 2015-08-18 13:26:59 +02:00
mdtrooper
8b63a9b811 Added name of agent in serialize data. TICKET: #2585 2015-08-18 13:02:07 +02:00
artica
80e14d22cb Auto-updated build strings. 2015-08-18 00:01:29 +02:00
mdtrooper
8f409cb5df Added times and days in the availability report item. TICKET: #2474 2015-08-17 18:06:24 +02:00
mdtrooper
969f5528c4 Cleaned source code style. 2015-08-17 18:05:55 +02:00
mdtrooper
49bdeb37d8 Fixed PHP Error. 2015-08-17 15:54:18 +02:00
artica
13b0145c88 Auto-updated build strings. 2015-08-17 00:01:28 +02:00
artica
36bf437b5c Auto-updated build strings. 2015-08-16 00:01:28 +02:00
artica
b5cc7093ea Auto-updated build strings. 2015-08-15 00:01:29 +02:00
Ramon Novoa
02ea140487 Catch Value_Error exceptions too when parsing module data.
(cherry picked from commit 8acb459029945306b9aa2aafc8d46a24829e462f)
2015-08-14 12:11:22 +02:00
artica
3b3039ea31 Auto-updated build strings. 2015-08-14 00:01:29 +02:00
Alejandro Gallardo Escobar
0eb729a7ce Fixed a pair of js errors 2015-08-13 12:10:32 +02:00
Alejandro Gallardo Escobar
9dda4271ee Fixed some errors, improved the code and prepared for compatibility w/ the metaconsole
(cherry picked from commit c6a04813c2c3eb2eb9b4aa616af61fdd6eb64a28)
2015-08-13 11:14:10 +02:00
Alejandro Gallardo Escobar
c4a52bad27 Fixed an error in the remote user autocreation
It was impossible to add tags to the autocreated user

(cherry picked from commit eeb9b6e1773cb08883f982543796175b3143e839)
2015-08-13 11:03:21 +02:00
artica
9fdc096a80 Auto-updated build strings. 2015-08-13 00:01:31 +02:00
Arturo Gonzalez Diaz
4e0f38841a Fixed error in recontasks. #Ticket2594 2015-08-12 16:16:18 +02:00
Ramon Novoa
f49cc7b7b8 Removed an unused variable. 2015-08-12 14:40:28 +02:00
Ramon Novoa
3b4abe4e17 Revert "Do post-processing before incremental constraints are evaluated (thanks"
This reverts commit a338458ec2c403dbc9caca29c12ddb4501cbca0b. New data
was compared against the previous value BEFORE post processing, so the
order was not important.
2015-08-12 14:10:14 +02:00
Arturo Gonzalez Diaz
ed85373908 Fixed error when user try to create a recon task. Ticket #2594 2015-08-12 11:44:23 +02:00
Ramon Novoa
a338458ec2 Do post-processing before incremental constraints are evaluated (thanks
to Chris Billson).
2015-08-12 11:24:08 +02:00
Ramon Novoa
f1f2c2f7e8 Merged some changes from 6.0 that affect incremental modules. 2015-08-12 10:43:14 +02:00
artica
aa1779832f Auto-updated build strings. 2015-08-12 00:01:29 +02:00
Ramon Novoa
a87a1f8750 Sort .data files by filename if modification times are the same. 2015-08-11 12:20:03 +02:00
artica
66fab9c4c2 Auto-updated build strings. 2015-08-11 00:01:31 +02:00
Alejandro Gallardo Escobar
74ba27c582 Now the module graph popup shows a control to set the start time
Also added date and time pickers
(cherry picked from commit 34f56c5f47074c4f65dd45430c282a3a49c1b035)

Conflicts resolved:
	pandora_console/operation/agentes/stat_win.php
2015-08-10 18:35:31 +02:00
Alejandro Gallardo Escobar
252197982a Improved some js include functions to echo the htm tags
-Functions:
ui_require_javascript_file
ui_require_jquery_file
ui_include_time_picker
(cherry picked from commit f8a5c503bf3c607c86fd4994fe39618993594bfe)
2015-08-10 18:27:57 +02:00
Alejandro Gallardo Escobar
83d1d312a8 Fixed the date format for Javascript
(cherry picked from commit 468c7be463cf5e43d4ee975d66e692495a9ccbdd)
2015-08-10 18:27:47 +02:00
Ramon Novoa
30ed3dbad5 Sort queued files before applying the one XML per agent limit.
(cherry picked from commit e113c7e850bb8f1f89a40465b45eae39861b1ec1)
2015-08-10 16:48:51 +02:00
Ramon Novoa
686f698fe8 Increased the default value of max_queue_files.
(cherry picked from commit 00cbda084342571d83677cb53fd5d2132460878a)
2015-08-10 16:48:44 +02:00
artica
a4cd154744 Auto-updated build strings. 2015-08-10 00:01:29 +02:00
artica
0f6f172d2f Auto-updated build strings. 2015-08-09 00:01:28 +02:00
artica
969168ec38 Auto-updated build strings. 2015-08-08 00:01:29 +02:00
artica
4183b8c9d1 Auto-updated build strings. 2015-08-07 00:01:28 +02:00
m-lopez-f
911d474f7e Change text of relogin when change permissions when login with AD
(cherry picked from commit a6b6fe4c30f4ebdd0b7e82c24da0e17d35b9feb0)
2015-08-06 13:42:11 +02:00
m-lopez-f
ffc3db41e6 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-08-06 13:22:56 +02:00
m-lopez-f
3aac54a84b Change help of advance permissions of AD. 2015-08-06 13:22:44 +02:00
artica
c035d6b655 Auto-updated build strings. 2015-08-06 00:01:32 +02:00
Alejandro Gallardo Escobar
9f57329f65 Fixed the error that caused the create button dissapeared under certain circunstances
(When no downtimes was retrieved)

TICKET #2580
2015-08-05 14:36:25 +02:00
mdtrooper
dd9c2029e2 Added new report item 'historical data' for to get a raw data of module' 2015-08-05 14:05:53 +02:00
mdtrooper
2f98c1fc86 Added functions in modules to get table of data and raw data. 2015-08-05 14:01:37 +02:00
Arturo Gonzalez Diaz
61a9376437 Fixed error in "free search" section (Alert detail). Ticket #2562 2015-08-05 12:36:31 +02:00
m-lopez-f
a11af4905c Fixed problems with login with AD 2015-08-05 10:52:21 +02:00
artica
3e6d9eb98a Auto-updated build strings. 2015-08-05 00:01:27 +02:00
m-lopez-f
9aa72dd191 Fixed default show option in filter options in manage agents. Tiquet:#2513
(cherry picked from commit b5ba16e31fbe8ce6db7843872360cd94ad30949f)
2015-08-04 16:41:53 +02:00
Arturo Gonzalez Diaz
494420aa68 Fixed error to create a module plugin with cli. Ticket #2549 2015-08-04 11:19:44 +02:00
m-lopez-f
599adf694c Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-08-04 09:31:14 +02:00
m-lopez-f
741442009d Change form to login when permission has changed to user. Tiquet: #2566 2015-08-04 09:30:53 +02:00
artica
7f5324b6f7 Auto-updated build strings. 2015-08-04 00:01:30 +02:00