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
9,821 Commits 34 Branches 30 Tags
Commit Graph

9821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ramon Novoa
c32c167b6e Ask for the old password before letting a user renew his password. 
(cherry picked from commit 0840c207646277c9eb7fb55504794d1d98e9c8a7)
 2015-05-19 11:38:30 +02:00
artica
2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +02:00
mdtrooper
0a9ae10a8f Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 16:25:22 +02:00
mdtrooper
45ea3dc3d9 Added json file icon. Thanks Carla. 2015-05-18 16:23:23 +02:00
mdtrooper
bc6e585d83 Removed the debug trace 2015-05-18 16:11:54 +02:00
mdtrooper
36467aaa5e Working in the refactoring the code of reports. Removed the xml code. 2015-05-18 14:49:02 +02:00
Ramon Novoa
2b698e5f35 Added a missing include. 
(cherry picked from commit 641600c9ef89f117e08f0a6a01c6fe66e05539c7)
 2015-05-18 11:06:23 +02:00
mdtrooper
34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +02:00
Sancho Lerena
bc2d8b3957 Fixed stupid typo on operation to show total available memory 
(cherry picked from commit cfc0583167ccdfb345df656e298334af54b94c01)
 2015-05-18 09:54:44 +02:00
artica
94fc0c72bb Auto-updated build strings. 2015-05-18 00:01:11 +02:00
artica
26c2e22b1c Auto-updated build strings. 2015-05-17 00:01:09 +02:00
artica
dd60a6ad3f Auto-updated build strings. 2015-05-16 00:01:10 +02:00
artica
c1fffcfc4f Auto-updated build strings. 2015-05-15 00:01:15 +02:00
mdtrooper
4387c36bbf Some fixed for the enterprise PDF reports. 2015-05-14 17:26:49 +02:00
mdtrooper
98d9032034 Some fixed for the enterprise PDF reports. 2015-05-14 16:21:04 +02:00
mdtrooper
60d301944d Some fixed for the enterprise PDF reports. 2015-05-14 15:52:55 +02:00
mdtrooper
fadeaef80a Some fixed for the enterprise PDF reports. 2015-05-14 13:17:59 +02:00
artica
d199846972 Auto-updated build strings. 2015-05-14 00:01:11 +02:00
Junichi Satoh
8a63bc171d Fixed module configuration error with open version (without enterprise). 2015-05-13 21:56:43 +09:00
mdtrooper
e005a352ab Some fixes for the enterprise PDF reports. 2015-05-13 13:55:54 +02:00
m-lopez-f
9cebf8ee34 This is more effective code from fixed bug, tiquet: #2216 
(cherry picked from commit 4a52fcff58ebfca1fff934118f5fadb68a018e89)
 2015-05-13 10:15:44 +02:00
m-lopez-f
dc5deadcd4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-13 09:44:52 +02:00
m-lopez-f
4c7e526494 Fixed problems with generate custom events with alerts. Tiquet: #2216 2015-05-13 09:44:43 +02:00
artica
7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
mdtrooper
9e75cce59f Some changes and fixed for the reports in PDF. 2015-05-12 18:18:48 +02:00
m-lopez-f
27013cb6e7 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 16:46:42 +02:00
mdtrooper
7ce25e9627 Some changes and fixed for the reports in PDF. 2015-05-12 16:41:08 +02:00
m-lopez-f
b6c49949e4 Revert "Fixed generate data and visual of visual console when user used wizard, tiquet: #2196" 
Problems with funcionality of visualconsole

This reverts commit 43bd6e010921e728af61d87d593096e8e0acea0f.
 2015-05-12 12:09:07 +02:00
m-lopez-f
43bd6e0109 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 11:08:43 +02:00
artica
d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
m-lopez-f
4a8952d6ec Fixed error when installing agent in windows, tiquet: 2157 
(cherry picked from commit 3b3c61aa2e2115d82f5af7050c885f38dfcbe84c)
 2015-05-11 14:44:26 +02:00
artica
1cc02b9013 Auto-updated build strings. 2015-05-11 00:01:11 +02:00
artica
a815e04f07 Auto-updated build strings. 2015-05-10 00:01:12 +02:00
artica
7c6934ff39 Auto-updated build strings. 2015-05-09 00:01:11 +02:00
m-lopez-f
9921304417 Fixed problems withs path in windows, tiquets: #2153,#2114 2015-05-08 09:51:53 +02:00
artica
3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
mdtrooper
def5a597a2 Fixed the image for the 'simple_graph' in the enterprise pdf reports. 2015-05-07 17:05:50 +02:00
m-lopez-f
8b84b82a09 Add commands to execute in windows server for real time graphs. Tiquet:#2191 
(cherry picked from commit cc7fcf71b302dc554c3932ff8080fd908ad5ebc6)
 2015-05-07 16:02:38 +02:00
m-lopez-f
a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
artica
4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper
0ec32cc826 Fixed the PHP Warnings about the re-start the session. 
(cherry picked from commit 1a035873dc79d04ffbf155a874e3eeed8eaa8c20)
 2015-05-06 18:43:10 +02:00
mdtrooper
1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
mdtrooper
c46bdc5087 Fixed the lost value for the config max_file_size. 
(cherry picked from commit d2e57f2ec889d292552435ee5df536c730ff2443)
 2015-05-06 18:29:20 +02:00
mdtrooper
d2e57f2ec8 Fixed the lost value for the config max_file_size. 2015-05-06 18:28:46 +02:00
mdtrooper
73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
mdtrooper
174726e253 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-06 16:39:37 +02:00
mdtrooper
c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
mdtrooper
94313bb249 Fixed the lost default parameter in the function. 2015-05-06 16:28:57 +02:00
mdtrooper
249e2e730d Working in the refactoring the code of reports (SLA_services). 2015-05-06 13:24:29 +02:00
m-lopez-f
50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +02:00