tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,571 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

12571 Commits

Author SHA1 Message Date
fbsanchez 3777a50abb Fixed minor issue: url of image resource while installing 
changed IP reference to global reference

(cherry picked from commit 5acdabe5f2)
 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 95b162f63a)
 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
daniel aeb99780ff ticket integria: 3992 fixed error in report avaibility #29 2016-08-24 17:18:57 +02:00
cesar991 094c11d868 Add force_service function in service_functions.py 2016-08-24 16:41:03 +02:00
Daniel Maya 5875f9161e Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-08-24 15:33:29 +02:00
Daniel Maya b63567bf3b Modified error messages and warnings. Ticket #3206. 2016-08-24 15:32:29 +02:00
m-lopez-f a98242d151 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 15:31:28 +02:00
Daniel Maya af0d5b868d Links updated. Ticket #3997. 2016-08-24 12:29:02 +02:00
cesar991 596fe02912 Add Network_server.py 2016-08-24 12:06:47 +02:00
cesar991 8ad79576cc Change Modules.py to Network_server.py 2016-08-24 12:04:50 +02:00
cesar991 cab24a7066 Change PAN3.py to Modules.py 2016-08-24 11:43:11 +02:00
artica 68dc8c6fad Auto-updated build strings. 2016-08-24 00:01:21 +02:00
Daniel Maya 2dffe9b1b8 Fixed token fontpath in windows. Ticket #3316. 2016-08-23 11:56:09 +02:00
Daniel Maya bb26f4b82d Added new check to equalize maximum thresholds. Ticket #3732. 2016-08-23 08:50:23 +02:00
artica 791a4c307f Auto-updated build strings. 2016-08-23 00:01:22 +02:00
daniel 2100a72c47 ticket integria: 3542 fixed token autocreate allow create modules in agent if exist 2016-08-22 12:17:07 +02:00
Hirofumi Kosaka ef10cc9ea6 Fixed some params did not set when token/value was separated with two or more spaces. 2016-08-22 19:05:53 +09:00
axl89 3a03b7e46c Revert "Merge branch 'testing_framework' into 'develop' " 
This reverts commit f8ec880e2a, reversing
changes made to dcb18bcbd2.
 2016-08-22 11:17:02 +02:00
axl89 cf2f97d43b Revert "Fixing test framework" 
This reverts commit c97c8d0868.
 2016-08-22 11:09:42 +02:00
axl89 08a2a15a76 Revert "Debugging new framework" 
This reverts commit bfa03fbf74.
 2016-08-22 11:09:38 +02:00
axl89 9d420b5fdc Revert "Fixing testing framework" 
This reverts commit 8ff0e773e2.
 2016-08-22 11:09:32 +02:00
artica c3d4cafacf Auto-updated build strings. 2016-08-22 00:01:17 +02:00
artica 68d51c9e33 Auto-updated build strings. 2016-08-21 00:01:16 +02:00
artica ab453aa235 Auto-updated build strings. 2016-08-20 00:01:21 +02:00
axl89 8ff0e773e2 Fixing testing framework 2016-08-19 16:56:48 +02:00
axl89 bfa03fbf74 Debugging new framework 2016-08-19 16:21:14 +02:00
axl89 c97c8d0868 Fixing test framework 2016-08-19 16:04:28 +02:00
axl89 f8ec880e2a Merge branch 'testing_framework' into 'develop' 
Testing framework v2

The testing framework should now run tests in parallel and annotate them successfully in SauceLabs

See merge request !1
 2016-08-19 15:49:54 +02:00