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 |
|
artica
|
27a5e07cf9
|
Auto-updated build strings.
|
2016-08-09 00:01:27 +02:00 |
|
artica
|
3098d09eae
|
Auto-updated build strings.
|
2016-08-08 00:01:38 +02:00 |
|
artica
|
54a65ee85f
|
Auto-updated build strings.
|
2016-08-07 00:01:36 +02:00 |
|
artica
|
a0d1bc3e5c
|
Auto-updated build strings.
|
2016-08-06 00:01:33 +02:00 |
|
artica
|
5bcb878ffd
|
Auto-updated build strings.
|
2016-08-05 00:01:27 +02:00 |
|
artica
|
18a878c8a7
|
Auto-updated build strings.
|
2016-08-04 00:01:27 +02:00 |
Hirofumi Kosaka
|
e636cac097
|
Modified to prefer '1' to enable server_ssl (to conform to the document).
('yes' is still working for it)
|
2016-08-03 19:29:09 +09:00 |
|
artica
|
d33a955caf
|
Auto-updated build strings.
|
2016-08-03 00:01:24 +02:00 |
|
artica
|
fc442402ce
|
Auto-updated build strings.
|
2016-08-02 00:01:26 +02:00 |
|
Ramon Novoa
|
59675c342c
|
Fixed the test.sh script.
|
2016-08-01 13:44:41 +02:00 |
|
Axel
|
ee9b161258
|
Update common_functions_60.py
|
2016-08-01 11:37:39 +02:00 |
|
artica
|
b8eb332b93
|
Auto-updated build strings.
|
2016-08-01 00:01:31 +02:00 |
|
artica
|
e9d3610fae
|
Auto-updated build strings.
|
2016-07-31 00:01:35 +02:00 |
|
artica
|
d767757d4a
|
Auto-updated build strings.
|
2016-07-30 00:01:25 +02:00 |
fbsanchez
|
9865bf7aff
|
Ticket 3462: Provided snmp help/std help based on referer
|
2016-07-29 15:44:07 +02:00 |
|
fbsanchez
|
d7d44d84e8
|
Extra options for grep_log plugin
+lines -lines around the matched one
|
2016-07-29 13:09:28 +02:00 |
Junichi Satoh
|
19fad8acc6
|
Updated Japanese translations.
|
2016-07-29 15:48:10 +09:00 |
|
artica
|
f37b22a373
|
Auto-updated build strings.
|
2016-07-29 00:01:28 +02:00 |
|
fbsanchez
|
4e61e32445
|
Ticket 3432. Custom dbgrant origin for remote installations
|
2016-07-28 13:42:15 +02:00 |
|
fbsanchez
|
856e2c4a38
|
Ticket 3940: missed main php file
|
2016-07-27 16:24:49 +02:00 |