Commit Graph

10526 Commits

Author SHA1 Message Date
artica b2af250070 Auto-updated build strings. 2015-07-01 00:01:46 +02:00
m-lopez-f 69bc104b99 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 17:06:15 +02:00
m-lopez-f b880f8c726 Fixed style event list in metaconsole 2015-06-30 17:05:58 +02:00
Vanessa Gil 3d973710a3 Updated translations. 2015-06-30 17:00:35 +02:00
Ramon Novoa a9f2171cce Show system events in the metaconsole. 2015-06-30 16:48:32 +02:00
Ramon Novoa 91ffd584b9 Added back a column that was accidentally removed. 2015-06-30 16:34:07 +02:00
Ramon Novoa 1c719b3bde Fixes for the metaconsole's plug-in server. 2015-06-30 16:34:07 +02:00
Ramon Novoa a54e99feba Brute force all known connection methods. A lot slower, but seems to
work better.
2015-06-30 16:34:07 +02:00
mdtrooper def7a59a97 Cleaned source code style. 2015-06-30 16:29:39 +02:00
Alejandro Gallardo Escobar dde4e21e60 Fixed an error with the group counters of the tree view 2015-06-30 16:14:50 +02:00
Alejandro Gallardo Escobar 0b2bdfa72d Improved the behaviour of the login page inputs 2015-06-30 15:48:54 +02:00
m-lopez-f 6f89828c76 Fixed problems to show groups fathers-childs in custom reports. Tiquet: #2351 2015-06-30 15:47:58 +02:00
fermin831 073165d107 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 13:47:08 +02:00
Alejandro Gallardo Escobar ff55ac9d25 Error fix 2015-06-30 13:37:53 +02:00
fermin831 bc126ebff3 Change agent_name in pandora_xml_stress.pl to permit agents name with
',",&,> and < characters.
2015-06-30 13:27:58 +02:00
Alejandro Gallardo Escobar 0549196ee5 Improved the styles of the offline update manager control to make it more pandora like 2015-06-30 13:20:20 +02:00
Alejandro Gallardo Escobar 21b7dc03b7 Merge branch 'feature/ticket#1862-Metaconsole-offline-um' into develop 2015-06-30 13:05:36 +02:00
Alejandro Gallardo Escobar a719100855 Improvements to add better compatibility with the metaconsole 2015-06-30 12:59:23 +02:00
artica 3928421049 Auto-updated build strings. 2015-06-30 00:01:26 +02:00
Alejandro Gallardo Escobar 7942c075d5 Added a modified a few icons for the area flot graph 2015-06-29 19:11:28 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
Alejandro Gallardo Escobar 711775f6a6 Fixed a missing 'forced_title_callback' and improved the function which creates new macro rows 2015-06-29 18:46:22 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
mdtrooper 2fd82b6ee5 Merge branch 'feature/ticket#1980-dynamic_reports' into develop 2015-06-29 13:26:14 +02:00
mdtrooper cf5b850c3f Some fixes in the dynamic reports for metaconsole. 2015-06-29 13:18:55 +02:00
m-lopez-f 53c2b4bae9 Change visual of plugin registration 2015-06-29 11:28:48 +02:00
m-lopez-f f88c2b4ce1 Only charge firts task when is console and not metaconsole 2015-06-29 10:43:03 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
artica d5380c67dd Auto-updated build strings. 2015-06-29 00:01:13 +02:00
artica 5394f3cc2c Auto-updated build strings. 2015-06-28 00:01:09 +02:00
artica 5e09c2bbf5 Auto-updated build strings. 2015-06-27 00:01:13 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view
(cherry picked from commit 15fb6f20a4)
2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
mdtrooper 8fedb02afa Added the constant ERR_COULDNT_RESOLVE_HOST
(cherry picked from commit 2b5d79b81c)
2015-06-26 12:00:22 +02:00
mdtrooper 2b5d79b81c Added the constant ERR_COULDNT_RESOLVE_HOST 2015-06-26 11:59:32 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
mdtrooper 87e60b80bc Fixed the call to io funcions in function 'config_update_value'.
(cherry picked from commit 4c91ec9063)
2015-06-26 10:33:27 +02:00
mdtrooper 4c91ec9063 Fixed the call to io funcions in function 'config_update_value'. 2015-06-26 10:31:09 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
artica cc58757d2e Auto-updated build strings. 2015-06-26 00:01:16 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
mdtrooper 247796ae8b Merge branch 'develop' into feature/ticket#1980-dynamic_reports 2015-06-25 16:02:27 +02:00
mdtrooper 77e1acc613 Working in the dynamic reports, these are the last changes in the refactored code. Now I am going to check in metaconsole. 2015-06-25 16:01:10 +02:00
mdtrooper 315744f668 Some changes for to get the data of template from array. 2015-06-25 13:48:12 +02:00
m-lopez-f b3c0d99fd2 Merge branch 'develop' into feature/NewView 2015-06-25 10:49:45 +02:00