8522 Commits

Author SHA1 Message Date
mdtrooper
46e2286bf8 Fixed and improved the function rss_error_handler for to show others errors 2014-10-09 15:03:54 +02:00
mdtrooper
e91c832172 Fixed the unset variables that show PHP warnings and break the RSS events 2014-10-09 13:50:05 +02:00
mdtrooper
4fc8515ead Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-09 12:36:52 +02:00
mdtrooper
aab8eb2545 Fixed the links between visualmaps. Ticket #1433 2014-10-09 12:36:26 +02:00
artica
3025521393 Auto-updated build strings. 2014-10-09 00:01:09 +02:00
mdtrooper
e27644a764 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-08 17:12:35 +02:00
mdtrooper
714702ec8f Implemented a form filter in the list of users. Ticket #1418 2014-10-08 17:12:13 +02:00
Vanessa Gil
1f75fa4b99 Merge branch 'feature/check_query' into develop 2014-10-08 16:49:03 +02:00
Vanessa Gil
772204cc7e Fixed error sql. 2014-10-08 16:48:03 +02:00
Ramon Novoa
48386c0abd Added an empty ChangeLog so that automake does not complain. 2014-10-08 16:07:32 +02:00
Junichi Satoh
47b11cee48 Updated japanese translations. 2014-10-08 20:50:39 +09:00
pandora-release
01e6665694 Updated version and build strings for the 5.1SP1RC1 release. 2014-10-08 13:28:58 +02:00
mdtrooper
1c83b25440 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-08 13:01:14 +02:00
mdtrooper
afb668ceeb Fixed the constants are used in the collections. Ticket #1428 2014-10-08 12:59:45 +02:00
artica
3686952dea Auto-updated build strings. 2014-10-08 00:01:10 +02:00
mdtrooper
e88ab123df Fixed the entry of recon task in the menu, now it is showed only for user with PM profile 2014-10-07 20:40:13 +02:00
mdtrooper
6af405da95 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-07 19:58:44 +02:00
mdtrooper
2177e0ff9f Fixed the urls in the downtime for to ACL users with AW 2014-10-07 19:58:19 +02:00
Vanessa Gil
dd89e505af Fixed bug when you filter events. 2014-10-07 19:03:14 +02:00
Vanessa Gil
ab5f57e72a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-10-07 16:34:59 +02:00
Vanessa Gil
7c21b508c5 Fixed link to event list in service map. 2014-10-07 16:33:54 +02:00
Sancho Lerena
87dd7bfe88 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-10-07 15:57:40 +02:00
Sancho Lerena
8e6e7cf701 Fixed missing parameter, was calling to a fixed path 2014-10-07 15:54:26 +02:00
Ramon Novoa
92edfd1cdc Delete old data that was not exported. 2014-10-07 14:51:47 +02:00
mdtrooper
fa3578d35e Fixed the lost name of group. Ticket #1419 2014-10-07 14:03:04 +02:00
mdtrooper
494176761b Fixed the update the tags. Ticket # 1417 2014-10-07 13:48:48 +02:00
Ramon Novoa
75be7a3180 Make sure the module still exists before compacting its data. 2014-10-07 11:59:46 +02:00
hkosaka
502393f796 Updated that add_event API can support newline literally. 2014-10-07 15:23:49 +09:00
artica
77c3df8eac Auto-updated build strings. 2014-10-07 00:01:08 +02:00
mdtrooper
750462e82d Fixed the check items of visualmap as module items when the are a visualmap linked items 2014-10-06 18:35:09 +02:00
mdtrooper
42db5c7e8c Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-06 15:55:38 +02:00
mdtrooper
954f0e77d2 Fixes the cleaned default values in the module plugins. Ticket #1406 2014-10-06 15:55:21 +02:00
artica
051b03fc30 Auto-updated build strings. 2014-10-06 00:01:09 +02:00
Junichi Satoh
a00c9afb44 Updated help. 2014-10-05 09:42:11 +09:00
artica
8e1651483a Auto-updated build strings. 2014-10-05 00:01:08 +02:00
artica
458928701c Auto-updated build strings. 2014-10-04 00:01:09 +02:00
Ramon Novoa
af1b588b32 Added a missing include. 2014-10-03 18:01:58 +02:00
Alejandro Gallardo Escobar
20933b6c92 Added some lost types to the "get_event_types" function 2014-10-03 12:53:38 +02:00
hkosaka
d6375b7fe0 Changed update_group's parameters in the same order of 'create_group'. 2014-10-03 15:56:23 +09:00
hkosaka
a70c7ead40 Added new API 'update_group'. 2014-10-03 14:17:37 +09:00
Junichi Satoh
fa79014e6e Added new tokens as the same as linux. 2014-10-03 13:10:16 +09:00
artica
f10df4cee5 Auto-updated build strings. 2014-10-03 00:01:13 +02:00
Ramon Novoa
c3b6c88bfb Fixed interface names. 2014-10-02 20:18:54 +02:00
Alejandro Gallardo Escobar
4c239b57db Fixed an error with the event comments 2014-10-02 19:37:18 +02:00
Alejandro Gallardo Escobar
2fdb99abd2 Finally, the comments are showed correctly on the events list 2014-10-02 18:38:14 +02:00
Alejandro Gallardo Escobar
834c9fc5e6 Revert "Now the comments are showed correctly on the events list"
This reverts commit a7f42d753ddd63dc2e58fffb6b86c3340433ce7d.
2014-10-02 18:31:58 +02:00
Alejandro Gallardo Escobar
a7f42d753d Now the comments are showed correctly on the events list 2014-10-02 18:23:44 +02:00
Ramon Novoa
69c0911f8a Make sure other parameters are properly read from pandora_server.conf. 2014-10-02 16:27:54 +02:00
Alejandro Gallardo Escobar
03831f456f Now the interface wizard adds the interface MAC to the module description 2014-10-02 16:05:31 +02:00
Alejandro Gallardo Escobar
29d3ae2024 Merge branch 'feature/ticket#1199-ReportTemplates' into develop 2014-10-02 15:28:20 +02:00