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
m-lopez-f
395414c1c3
Fixed problems with advance configuration permissions of Active Directory. Tiquet: #2566
2015-08-03 13:50:32 +02:00
m-lopez-f
f6fed60832
Add new funcionality of remote login with Active Directory
2015-08-03 12:17:41 +02:00
crash890
4e193e1cf6
Update update_manager.ajax.php
...
This would be to include proxy configuration in the download process. Without this Proxy will work to check for downloads, but the actual download does not respect the proxy settings.
(cherry picked from commit 620d8e01b8aa49e8be867eb9fe385ef72b156230)
2015-08-03 08:42:59 +02:00
artica
571572660d
Auto-updated build strings.
2015-08-03 00:01:27 +02:00
artica
2835d2cad3
Auto-updated build strings.
2015-08-02 00:01:28 +02:00
artica
3dd7c9bf5b
Auto-updated build strings.
2015-08-01 00:01:28 +02:00
fbsanchez
778512868e
changes on plugin call (windows)
2015-07-31 12:25:35 +02:00
artica
e6799ad82b
Auto-updated build strings.
2015-07-31 00:01:28 +02:00
m-lopez-f
e19c002470
Fixed LDAP connection when name containt space and data login is false
...
(cherry picked from commit fd7fc4eb00a085b4b252d6f1b89656671d68fa58)
2015-07-30 16:11:29 +02:00
artica
415a4f4373
Auto-updated build strings.
2015-07-30 00:01:29 +02:00
Arturo Gonzalez Diaz
fd2eb27de8
Now the group of a module belonging to a policy does not go away by making some modification in the module. Ticket#2554
2015-07-29 13:34:51 +02:00
m-lopez-f
4c52129186
Add order data in metaconsole enterprise. Tiquet: #2232
...
(cherry picked from commit 25106d83837f9384f9a1fe545398c8a8fcc900f2)
2015-07-29 10:13:55 +02:00
artica
c343ca36ef
Auto-updated build strings.
2015-07-29 00:01:31 +02:00
artica
2673558495
Auto-updated build strings.
2015-07-28 00:01:29 +02:00
artica
54bcc8a7a4
Auto-updated build strings.
2015-07-27 00:01:28 +02:00
artica
546fb5de11
Auto-updated build strings.
2015-07-26 00:01:27 +02:00
artica
fdcd2cb1db
Auto-updated build strings.
2015-07-25 00:01:29 +02:00
mdtrooper
c68da1de83
Fixed the numeric format of failed % in report.
2015-07-24 15:41:39 +02:00
artica
032acc5cb3
Auto-updated build strings.
2015-07-24 00:01:28 +02:00
Arturo Gonzalez Diaz
d3bb628ea2
Merge branch 'pandora_5.1' into feature/ticket#2179-recontask-view-acl
2015-07-23 16:28:22 +02:00
Arturo Gonzalez Diaz
4ede845c1c
Recon-task ACL changed. Ticket #2179
2015-07-23 16:27:20 +02:00
