tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,645 Commits 34 Branches 30 Tags
Commit Graph

11645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
m-lopez-f
06e37132a8 Fixed problems qith html editor in textareas in visual console 2016-07-21 14:48:56 +02:00
Ramon Novoa
3654009b8d Set the right OS and version for self-monitoring. 
(cherry picked from commit 42454cd3e2cf73092e3f8a1e21678f02fe0c85ec)
 2016-07-21 12:40:50 +02:00
m-lopez-f
72f8881685 Fixed problems with bullet charts. Tiquet: #3822 2016-07-21 11:07:09 +02:00
Hirofumi Kosaka
517cf4c1a3 Added the handling of agent's address list at new_agent/update_agent API call. 2016-07-21 17:31:37 +09:00
Arturo Gonzalez
b7681c23c8 Fixed gauge graphs in visual console. Ticket 4 (gitlab) 
(cherry picked from commit 29dfd3df9b3ae25f835f61ef14a23d7c21ebc945)
 2016-07-21 08:47:39 +02:00
artica
b7bb1294aa Auto-updated build strings. 2016-07-21 00:01:32 +02:00
Arturo Gonzalez
4f8ef1e0c4 Added a nice structure to new versions. Ticket #3813 
(cherry picked from commit 620ff6a324df48b10e1d80edacba801eeab3091d)
 2016-07-20 16:08:46 +02:00
Hirofumi Kosaka
8e96378695 Fixed bug the Trap Generator failed at FreeBSD. 2016-07-20 18:52:32 +09:00
artica
85ad9eb2ac Auto-updated build strings. 2016-07-20 00:01:35 +02:00
axl89
d97f13565e Brought develop test structure and new tests to pandora_6.0 branch 2016-07-19 19:15:32 +02:00
Daniel Maya
ba9c3c5d84 Fixed CSV export in system audit log. Ticket #3902. 
(cherry picked from commit 4262956711c79cbd4a789c87be4977a5ba3a3a7a)
 2016-07-19 16:14:22 +02:00
Daniel Maya
f3b1de0472 Fixed icon in graphs. Ticket #3830. 
(cherry picked from commit 24a9eee6e83b0032be114244ddef287597b32208)
 2016-07-19 15:58:23 +02:00
artica
3eeea3eec6 Auto-updated build strings. 2016-07-19 00:01:26 +02:00
cesar991
52403c9cf2 Add import create_module function in policy_functions 2016-07-18 12:09:48 +02:00
cesar991
8ecc2a2bf1 Add search_policy and add_module_policy functions in policy_functions.py 2016-07-18 12:02:06 +02:00
artica
282a0e72f8 Auto-updated build strings. 2016-07-18 00:01:29 +02:00
artica
e2383f040a Auto-updated build strings. 2016-07-17 00:01:21 +02:00
artica
b2d636d365 Auto-updated build strings. 2016-07-16 00:01:29 +02:00
axl89
b2e767dd95 Modified tests to use refactorized function 2016-07-15 14:33:19 +02:00
cesar991
2b81c0bd6c Refactorized create_module functions and create policy_functions 2016-07-15 14:27:40 +02:00
axl89
c43125a5db Added print in login and logout to prevent TRAVIS timeouts 2016-07-15 10:51:35 +02:00
Hirofumi Kosaka
2a90541e05 Fixed bug that url-unsafe chars could be generated for download URL. 
(e.g. multi-byte chars included in target file name)
 2016-07-15 16:26:09 +09:00
Junichi Satoh
81fe7bd8b6 Removed unused argument from check_acl() and added new option(argument) for 
roots up.
Fixed that users_can_manage_group_all() returns true even if user does not
have rights to manage group all.

(cherry picked from commit 11aba4ce63f61d7992bf3db9ad1165cb62c06175)
 2016-07-15 15:54:38 +09:00
artica
d2811e57f2 Auto-updated build strings. 2016-07-15 00:01:29 +02:00
cesar991
b675be3be3 Added PAN9 2016-07-14 16:42:10 +02:00
cesar991
a4247adee6 Merge branch 'pandora_6.0' of github.com:pandorafms/pandorafms into pandora_6.0 2016-07-14 16:30:37 +02:00
cesar991
7c5b2a3037 Add change in search_agent to develop in pandora_6.0 2016-07-14 16:26:06 +02:00
Axel
117a36216e Update PAN8.py 2016-07-14 12:10:29 +02:00
cesar991
240e61817b Repair PAN8.py 2016-07-14 12:05:39 +02:00
cesar991
cf1f1f2e1e Delete get_acl_dict function 
(cherry picked from commit 00752bd40692785aacef294c1ab6300aa254d398)

Conflicts:
	tests/console/include/user_functions.py
 2016-07-14 12:02:13 +02:00
artica
cc5a16aeb9 Auto-updated build strings. 2016-07-14 00:01:26 +02:00
Arturo Gonzalez
f96442ba37 Added some changes to SAML login system. 
(cherry picked from commit 318ba4f049250af35ae24a574186ffe75d328c76)
 2016-07-13 15:34:55 +02:00
cesar991
8385e5e129 Brought tests from develop to 6.0 branch 2016-07-13 12:25:43 +02:00
artica
80a9739f4c Auto-updated build strings. 2016-07-13 00:01:25 +02:00
artica
c0605809a6 Auto-updated build strings. 2016-07-09 00:01:23 +02:00
artica
afb6d566fb Auto-updated build strings. 2016-07-08 00:01:25 +02:00
artica
faa2a02ba8 Auto-updated build strings. 2016-07-07 00:01:24 +02:00
Daniel Maya
cfcd09b7ba New icon in shortcut bar. Ticket #3018. 
(cherry picked from commit 0346516129f9d8ca24afa76e8cbefbe66454fa1b)
 2016-07-06 12:34:26 +02:00
artica
b2677386ed Auto-updated build strings. 2016-07-06 00:01:25 +02:00
Daniel Maya
fa2f98f2ab alerts disabled agents, return to normal state. Ticket #3806. 
(cherry picked from commit 68ad5319186fbe254f5f057dfe21666111648c71)
 2016-07-05 11:56:38 +02:00
fbsanchez
2cc6d2e3f9 minor fix 2016-07-04 10:50:26 +02:00
fbsanchez
b954f78542 Fixed: File upload (mib upload)i 
> safe_output on field and php warning
 2016-07-04 10:49:29 +02:00
Ramon Novoa
671fbb6835 Tell MySQL to return UTF-8 strings on win32. 2016-07-01 15:45:37 +02:00
axl89
5a68d2a065 Fixed french translation 2016-07-01 13:10:00 +02:00
artica
9ab625b2a6 Auto-updated build strings. 2016-07-01 00:01:28 +02:00
Daniel Maya
d4cae402ed Fixed labels in pie custom graphs. Ticket #3873. 
(cherry picked from commit 834612f125b3de5ed5f77fa958b15ec45b8ceb6e)
 2016-06-30 10:49:31 +02:00
Daniel Maya
a770d51c73 Added pagination in custom graphics. Ticket #3886. 
(cherry picked from commit 00b17f5eda429bd8f4fd2f1e12813c65cf2fbf41)
 2016-06-30 08:50:04 +02:00
artica
6ee0cf2320 Auto-updated build strings. 2016-06-30 00:01:29 +02:00
axl89
b6919492c7 Fixed translations to Spanish 2016-06-29 15:19:42 +02:00
Axel
38af0fe510 Update menu.php 
Fixed a call to the translation function
 2016-06-29 15:14:31 +02:00