11767 Commits

Author SHA1 Message Date
cesar991
778f02b81a Repair errors in Services.py
(cherry picked from commit 7266a95b0ca000f32bc149cded315d790ea4a2cf)
2016-08-31 14:55:09 +02:00
m-lopez-f
269b4365a6 Fixed problems with sql in metaconsole when used group agents in events list. Ticket: #3079
(cherry picked from commit 051ee37696ffd818c23d8c21cc6f3028547254be)
2016-08-31 14:44:12 +02:00
cesar991
4e358417e2 Add service auto tests
(cherry picked from commit 22f5b29b47b15319479287a960fbeb173a61de84)
2016-08-31 14:42:13 +02:00
m-lopez-f
498ad5f42c Fixed problems with line father when use pure in visual console. Internal ticket: #3936
(cherry picked from commit e815ea022b0d534857070305137506233e252761)
2016-08-31 14:40:30 +02:00
fermin831
3ef4ea3215 Changed require for include 2016-08-31 12:08:50 +02:00
artica
d0f59acaef Auto-updated build strings. 2016-08-31 00:01:35 +02:00
cesar991
ec1bd8af2f Created Services test to its new version (with API calls) 2016-08-30 16:30:42 +02:00
fbsanchez
77ed3ae3fc Fixed double include (functions_modules.php) 2016-08-30 13:56:51 +02:00
axl89
dcd6e1f6a4 Updated english translations
(cherry picked from commit 9f22e7fec09f7ba56de2557cbb11f602a454bedb)
2016-08-30 13:06:51 +02:00
fermin831
c903e45ff0 RSS menu does not appear if IP is not in white API IP list
(cherry picked from commit 7462ff1ece7a866aee3901f44dc2d915da27bada)
2016-08-30 10:49:56 +02:00
artica
46798f833a Auto-updated build strings. 2016-08-30 00:01:40 +02:00
Daniel Maya
33c63526b1 Fixed problem with the permissions of the visual console. Ticket #4000.
(cherry picked from commit e21eabbf049a7c4b1cfc9ed5863158b4f9ebe60d)
2016-08-29 16:07:47 +02:00
fbsanchez
d7eec51fdd Excluded exe files from tarballs #3498
(cherry picked from commit e267398198b3ae9a02aa040c2b8ce1d94213e062)
2016-08-29 15:34:40 +02:00
m-lopez-f
fc4874fbd0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 13:25:00 +02:00
fbsanchez
5acdabe5f2 Fixed minor issue: url of image resource while installing
changed IP reference to global reference
2016-08-29 13:14:50 +02:00
Daniel Maya
cb8b91ad32 Fixed bug in recontask form. Ticket #3960.
(cherry picked from commit 108340dbee5d861f3db7d5cf98a35cc7e6003419)
2016-08-29 12:59:11 +02:00
fbsanchez
3891be0bc2 Fixed minor issue: url of image resource while installing 2016-08-29 12:54:22 +02:00
m-lopez-f
d6f75b7880 Fixed problems with thresholded in interactive graphs. Internal Ticket: #3777
(cherry picked from commit 794275a13c68eff20f1c8dc7fb2cb7034834b9b5)
2016-08-29 12:36:08 +02:00
Daniel Maya
db09b83e57 Fixed orders groups. Ticket #3926.
(cherry picked from commit 0e53477fa799e5db3306f0b1559f87af4369ed08)
2016-08-29 12:07:52 +02:00
m-lopez-f
1f762f89e5 Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:48:08 +02:00
m-lopez-f
ac25696355 Fixed search form. Tiquet: #3988 2016-08-29 09:47:29 +02:00
artica
28fbddd891 Auto-updated build strings. 2016-08-29 00:02:42 +02:00
artica
f52b93985e Auto-updated build strings. 2016-08-28 00:02:21 +02:00
artica
ed2517600a Auto-updated build strings. 2016-08-27 00:02:54 +02:00
Daniel Maya
e956b90a1e added default fontpath for windows. Ticket #3316.
(cherry picked from commit 7dbc6414048cb6e9e01472365cc1fff19872b738)
2016-08-26 12:45:12 +02:00
m-lopez-f
8dc302d313 Add if use ssl cert and path of this cert. #5
(cherry picked from commit be3a5204887d6f9c38bc8e0d44207890f7560761)
2016-08-26 12:42:20 +02:00
artica
f83927852c Auto-updated build strings. 2016-08-26 00:02:11 +02:00
fbsanchez
95b162f63a Ticket Integria: 3951 Changed workaround to generate api module graphs #31 2016-08-25 20:16:03 +02:00
cesar991
736a2cb2ac Add Service.py and modify Service_functions.py 2016-08-25 17:16:23 +02:00
daniel
b4823b0c6c Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-08-25 11:52:40 +02:00
daniel
fe5ceb3272 ticket integria: 3996 fixed minor error in maxlenght #30
(cherry picked from commit 4375feab7291ac94f48e8d1134ae6a6240628dde)
2016-08-25 11:50:25 +02:00
cesar991
da051f6c64 Add add_elemets_to_service function in service_functions.py 2016-08-25 11:46:11 +02:00
artica
1064880726 Auto-updated build strings. 2016-08-25 00:02:23 +02:00
daniel
008e610cc7 ticket integria: 3992 fixed error in report avaibility #29
(cherry picked from commit aeb99780ffa8691d564f828a222603e355920acb)
2016-08-24 17:20:10 +02:00
cesar991
12f3465098 Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-08-24 16:36:31 +02:00
cesar991
ad7c243ad0 Add force_service function 2016-08-24 16:35:44 +02:00
m-lopez-f
f0c34fb301 Fixed search form. Tiquet: #3988 2016-08-24 15:38:20 +02:00
cesar991
d241218ae8 Updated tests 2016-08-24 11:52:28 +02:00
cesar991
fcb86b3f5c Change PAN3.py to Modules.py
(cherry picked from commit cab24a7066556a7f405124a38aff7cc9b511264d)
2016-08-24 11:45:15 +02:00
m-lopez-f
5d89aea854 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 11:03:17 +02:00
Hirofumi Kosaka
335c420be5 Fixed some params did not set when token/value was separated with two or more spaces.
(based on cherry-pick ef10cc9ea68d34825bb20a5b084c26e4917e1810 for develop branch)
2016-08-24 16:00:56 +09:00
artica
d3e0784b70 Auto-updated build strings. 2016-08-24 00:02:02 +02:00
Daniel Maya
bed4f8e3d8 Fixed token fontpath in windows. Ticket #3316.
(cherry picked from commit 2dffe9b1b807ea3bf739cb89b6d08b2ca06c24a1)
2016-08-23 12:01:15 +02:00
Daniel Maya
b52223a7ea Added new check to equalize maximum thresholds. Ticket #3732.
(cherry picked from commit bb26f4b82d88d33b9fdfdea105139d9eee37e97c)

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 d1794b8385582d1d4c2878b392881db8f2bf1ab9)
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 bf410480186a9253842c085d24a764c3d537d71c)
2016-08-18 10:29:28 +02:00
daniel
5b2530721e Ticket integria: 3909 fixed name export csv #26
(cherry picked from commit 6a9fd3805ab5ad506add3725453d080d8d79f81a)
2016-08-18 09:30:29 +02:00
artica
e370bc8509 Auto-updated build strings. 2016-08-18 00:01:40 +02:00