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

11830 Commits

Author SHA1 Message Date
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 11aba4ce63)
 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 00752bd406)

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 318ba4f049)
 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 0346516129)
 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 68ad531918)
 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 834612f125)
 2016-06-30 10:49:31 +02:00
Daniel Maya a770d51c73 Added pagination in custom graphics. Ticket #3886. 
(cherry picked from commit 00b17f5eda)
 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
Daniel Maya 127e565ea3 Fixed integria_rticket.pl. Ticket #3673. 
(cherry picked from commit 8cbbda06db)
 2016-06-29 12:45:28 +02:00
Daniel Maya 6bb5b93a7f show unknown and not init modules. Ticket #3844. 
(cherry picked from commit e4cdef363e)
 2016-06-29 10:44:00 +02:00
artica 3277b6e47e Auto-updated build strings. 2016-06-29 00:01:26 +02:00
axl89 087feb892d Added the AMI initialization script 2016-06-28 18:22:20 +02:00
Daniel Maya e9dc54360e Fixed issue. Ticket #3844. 
(cherry picked from commit 2f5457d938)
 2016-06-28 16:11:45 +02:00
Daniel Maya 60834ec44d Changed Server Help. Ticket #2932. 
(cherry picked from commit c0ec08d23b)
 2016-06-28 15:43:15 +02:00
Daniel Maya ee35e98fed New filter actions. Ticket #3893. 
(cherry picked from commit ec073eb8b4)
 2016-06-28 15:34:45 +02:00
artica 69796812c4 Auto-updated build strings. 2016-06-28 00:01:27 +02:00
Ramon Novoa c22ea46899 Fixed a regexp in functions_api.php. Sometimes img tags are not properly 
closed!
 2016-06-27 13:37:40 +02:00
m-lopez-f a8b4f7f535 Fixed help of action alerts. Tiquet: #3889 
(cherry picked from commit 04c1304a5d)
 2016-06-27 13:10:07 +02:00
Daniel Maya 4b84d63ef8 Fixed path. Ticket #3364. 
(cherry picked from commit d6b614199a)
 2016-06-27 11:58:31 +02:00
Daniel Maya 5b47b9a323 redirect mobile. Ticket #3364. 
(cherry picked from commit a75e416b8c)

Conflicts:
	pandora_console/index.php
 2016-06-27 11:23:44 +02:00
Daniel Maya f3374742ea Changed in integria_rticket.pl. Ticket #3767. 
(cherry picked from commit 02ead6cb1d)
 2016-06-27 09:41:46 +02:00
artica 2c0ffb3453 Auto-updated build strings. 2016-06-27 00:01:24 +02:00
artica af29615d17 Auto-updated build strings. 2016-06-26 00:01:29 +02:00