12447 Commits

Author SHA1 Message Date
Daniel Maya
b6181de25c Fixed foreign key. Ticket #3930. 2016-08-31 17:35:33 +02:00
Daniel Maya
e963d59494 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-08-31 15:38:19 +02:00
Daniel Maya
b8306bbf00 Added search by multiple ips agents. Ticket #3949. 2016-08-31 15:34:05 +02:00
cesar991
f2e73fe7f4 Change create_agent in Bulk_operation.py and add is_enterprise in Services.py
(cherry picked from commit 928cc0dee4f6408ff80fdceff40175eb96db7436)
2016-08-31 15:32:39 +02:00
m-lopez-f
a0753238f7 When click in management permmision autoclicked in inferior options of same part. Ticket: #3912 2016-08-31 15:23:05 +02:00
cesar991
859cec259e Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-08-31 14:54:21 +02:00
cesar991
7266a95b0c Repair errors in Services.py 2016-08-31 14:54:02 +02:00
m-lopez-f
051ee37696 Fixed problems with sql in metaconsole when used group agents in events list. Ticket: #3079 2016-08-31 14:43:40 +02:00
cesar991
c301d99ce1 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-08-31 14:40:07 +02:00
m-lopez-f
e815ea022b Fixed problems with line father when use pure in visual console. Internal ticket: #3936 2016-08-31 14:39:51 +02:00
cesar991
22f5b29b47 Add service auto tests 2016-08-31 14:39:32 +02:00
fermin831
d0c1d5eede Changed require for include 2016-08-31 12:10:14 +02:00
Daniel Maya
58f0ccae77 Added default event filter. Ticket #3930. 2016-08-31 11:13:37 +02:00
artica
88d46448ca Auto-updated build strings. 2016-08-31 00:01:19 +02:00
cesar991
752634c35d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-08-30 16:28:07 +02:00
cesar991
6f2d18227c Created Services test to its new version (with API calls) 2016-08-30 16:27:38 +02:00
m-lopez-f
cfb7948f2d Testing 2016-08-30 14:52:01 +02:00
fbsanchez
cdc683a1f8 Fixed double include (functions_modules.php)
(cherry picked from commit 77ed3ae3fcb783ad79cb6ff4045d318f954a9153)
2016-08-30 13:57:29 +02:00
axl89
2ef51245b2 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 2016-08-30 13:06:24 +02:00
axl89
9f22e7fec0 Updated english translations 2016-08-30 13:06:10 +02:00
fermin831
7462ff1ece RSS menu does not appear if IP is not in white API IP list 2016-08-30 10:47:00 +02:00
artica
ff46f5c628 Auto-updated build strings. 2016-08-30 00:01:19 +02:00
m-lopez-f
3ae6866ab0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 16:09:11 +02:00
Daniel Maya
e21eabbf04 Fixed problem with the permissions of the visual console. Ticket #4000. 2016-08-29 16:05:37 +02:00
fbsanchez
e267398198 Excluded exe files from tarballs #3498 2016-08-29 15:33:35 +02:00
m-lopez-f
d914474e74 Fixed problems with menu. Internal Ticket: #3912
(cherry picked from commit fc4874fbd0b02df71ed8d668b6d0a771b5cb034d)
2016-08-29 13:25:43 +02:00
fbsanchez
3777a50abb Fixed minor issue: url of image resource while installing
changed IP reference to global reference

(cherry picked from commit 5acdabe5f2647f243a75d00bc2bcdda4577fc12e)
2016-08-29 13:15:39 +02:00
Daniel Maya
61a0464e5b Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-08-29 12:58:10 +02:00
Daniel Maya
108340dbee Fixed bug in recontask form. Ticket #3960. 2016-08-29 12:56:23 +02:00
fbsanchez
c1d696eab2 Fixed minor issue: url of image resource while installing 2016-08-29 12:55:01 +02:00
m-lopez-f
794275a13c Fixed problems with thresholded in interactive graphs. Internal Ticket: #3777 2016-08-29 12:35:27 +02:00
Daniel Maya
0e53477fa7 Fixed orders groups. Ticket #3926. 2016-08-29 12:04:44 +02:00
cesar991
7ac687bf66 Repair error in api_functions.py 2016-08-29 11:27:47 +02:00
cesar991
11e0632057 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-08-29 11:09:38 +02:00
cesar991
8552af711a Repair error include and add new api function 2016-08-29 11:08:47 +02:00
m-lopez-f
2db19c539f Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:40:43 +02:00
artica
ab1055bb23 Auto-updated build strings. 2016-08-29 00:01:13 +02:00
artica
4b0480ae4d Auto-updated build strings. 2016-08-28 00:01:14 +02:00
artica
c431361955 Auto-updated build strings. 2016-08-27 00:01:22 +02:00
cesar991
4d0664e4a6 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-08-26 13:42:16 +02:00
cesar991
89f42767cb Add api_functions.py file 2016-08-26 13:40:04 +02:00
Daniel Maya
3b6c322cae Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-08-26 12:43:23 +02:00
m-lopez-f
be3a520488 Add if use ssl cert and path of this cert. #5 2016-08-26 12:41:34 +02:00
Daniel Maya
7dbc641404 added default fontpath for windows. Ticket #3316. 2016-08-26 12:38:30 +02:00
artica
e2bc2002f4 Auto-updated build strings. 2016-08-26 00:01:17 +02:00
fbsanchez
b644f15d00 Ticket Integria: 3951 Changed workaround to generate api module graphs #31
(cherry picked from commit 95b162f63a1479883a369fac884300edd8e640d8)
2016-08-25 20:22:11 +02:00
cesar991
b153e7c822 Add is_critical value in add_elements_to_service function 2016-08-25 12:28:57 +02:00
cesar991
4e94cef3f0 Add add_element_to_service function in service_functions.py 2016-08-25 11:56:22 +02:00
daniel
4375feab72 ticket integria: 3996 fixed minor error in maxlenght #30 2016-08-25 11:49:23 +02:00
artica
1c8440ef7b Auto-updated build strings. 2016-08-25 00:01:32 +02:00