mdtrooper
819b1d5d77
Clean the source code style.
2015-06-08 09:32:01 +02:00
mdtrooper
b96fdad6d8
Sanitized the project (clean code and removed the deprecated htmLaWed)
2015-06-08 09:18:00 +02:00
artica
b7bf0dbc3a
Auto-updated build strings.
2015-06-08 00:01:10 +02:00
artica
096a17be2e
Auto-updated build strings.
2015-06-07 00:01:09 +02:00
artica
efa871b22b
Auto-updated build strings.
2015-06-06 00:01:09 +02:00
mdtrooper
371aafa3fa
Fixes for the Oracl€.
2015-06-05 14:47:50 +02:00
mdtrooper
4a86e40ca2
Fixed the PHP Warning about the config var. (manual cherry-pick from e326c8ff20
)
2015-06-05 12:52:18 +02:00
m-lopez-f
866cdb908e
No show count events group by status(validate,not validate) in statics events. Tiquet: #2306
2015-06-05 10:21:24 +02:00
artica
352d0e95ff
Auto-updated build strings.
2015-06-05 00:01:09 +02:00
artica
4a4f04d833
Auto-updated build strings.
2015-06-04 00:01:10 +02:00
Ramon Novoa
38c90b43d1
Do not draw parent/child relationships in layer 2 maps.
...
(cherry picked from commit 16c2e10a4f
)
2015-06-03 17:21:16 +02:00
mdtrooper
a9675820b9
Fixes for the Oracl€.
2015-06-03 17:00:28 +02:00
Alejandro Gallardo Escobar
ce75ea467a
Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle
2015-06-03 15:57:09 +02:00
Alejandro Gallardo Escobar
33129d89ce
Instantiated an object (table) to avoid PHP warnings
2015-06-03 15:56:25 +02:00
mdtrooper
3ca9a23d0a
Fixes for the Oracl€.
2015-06-03 15:53:52 +02:00
artica
51e76a0289
Auto-updated build strings.
2015-06-03 00:01:12 +02:00
mdtrooper
9bba19235e
Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle
2015-06-02 19:10:15 +02:00
mdtrooper
11d2b66b30
Fixes for the Oracl€.
2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar
f905ea1b16
Adapted the changes done by Rober Nelson in the commit e943bf0ada
2015-06-02 18:56:03 +02:00
Alejandro Gallardo Escobar
8fbe1175b5
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/DEBIAN/control
pandora_console/DEBIAN/make_deb_package.sh
pandora_console/include/config_process.php
pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
Alejandro Gallardo Escobar
ade22203c5
Added a new option to the db connection function
2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar
6d47307ad2
Fixes for oracle
2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar
127f53e8c8
Added the new function "set_when_empty"
2015-06-02 18:03:39 +02:00
artica
bdda81b436
Auto-updated build strings.
2015-06-02 00:01:10 +02:00
mdtrooper
f2539395c3
Fixes for the Oracl€.
2015-06-01 17:04:02 +02:00
m-lopez-f
988228a90a
Fixed problems with snmpwalks, when server have mibs text in hexadeximal-string. Tiquet: #2288
...
(cherry picked from commit 127daf8fdc
)
2015-06-01 15:24:53 +02:00
m-lopez-f
589f054928
Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261
2015-06-01 13:41:31 +02:00
mdtrooper
0df14010c9
Fixed the SLA item in the reports into metaconsole when some agents into this is disabled.
2015-06-01 12:47:39 +02:00
mdtrooper
fd90f637df
Fixed the availability item in the reports into metaconsole when some agents into this is disabled.
2015-06-01 12:09:44 +02:00
mdtrooper
1e71fc56bd
Fixes for the Oracl€.
2015-06-01 11:15:54 +02:00
m-lopez-f
84fb973c6f
Change privilege in call function to return groups of view this user. Tiquet: #2259
...
(cherry picked from commit 73ae001a3f
)
2015-06-01 10:13:42 +02:00
artica
306c7f016a
Auto-updated build strings.
2015-06-01 00:01:09 +02:00
artica
528c9f79f0
Auto-updated build strings.
2015-05-31 00:01:09 +02:00
artica
e4c9b07266
Auto-updated build strings.
2015-05-30 00:01:11 +02:00
mdtrooper
0297e38361
Fixes for the Oracl€.
2015-05-29 16:48:40 +02:00
mdtrooper
e4703a6f86
Fixed the function 'oracle_encapsule_fields_with_same_name_to_instructions'.
2015-05-29 16:48:14 +02:00
mdtrooper
2aa7f0994d
Fixed the false positive errors with some SQL querys return empty data.
2015-05-29 15:23:52 +02:00
mdtrooper
4a36d18fe8
Fixed the error management in Oracl€.
2015-05-29 15:19:32 +02:00
mdtrooper
5c7b230e9b
Merge some changes and fixed from the 'develop' branch.
2015-05-29 14:16:39 +02:00
m-lopez-f
2d646ce620
Fixed problems with list of interfaces in snmp walk wizard of interfaces. Tiquet: #2288
...
(cherry picked from commit cc861fd3a1
)
2015-05-29 10:18:38 +02:00
artica
16fa2ec329
Auto-updated build strings.
2015-05-29 00:01:13 +02:00
m-lopez-f
b8d10749b0
Changed name of labels menu and options in bulk operations
2015-05-28 13:42:34 +02:00
m-lopez-f
0137ee1e02
Fixed error sql querys in mygrate sql
2015-05-28 12:41:16 +02:00
Ramón Novoa
01327ba01f
Merge pull request #15 from Robert-Nelson/ipmi-recon
...
Fix IPMI recon script so that it works with new style custom fields
2015-05-28 12:26:14 +02:00
m-lopez-f
47a6c973d1
Add more width to select tags in filters events and truncate name. Tiquet: #2015
2015-05-28 10:34:10 +02:00
artica
70cc8fbc8f
Auto-updated build strings.
2015-05-28 00:01:10 +02:00
Alejandro Gallardo Escobar
185a101132
Removed a require of a deleted file
2015-05-27 16:02:22 +02:00
Alejandro Gallardo Escobar
09998429b7
Modified the alert messages the system stores in the user session
2015-05-27 16:01:52 +02:00
m-lopez-f
aba3379d73
Changed images in error login page because don't show with new style. Tiquet: #2233
2015-05-27 12:36:40 +02:00
m-lopez-f
9aecbd29cf
Changed image to os bsd
...
(cherry picked from commit 750f62ccb5
)
2015-05-27 10:40:53 +02:00
m-lopez-f
c02622bd53
Add order by column Description in Agents detail. Tiquet: #2272
2015-05-27 08:58:50 +02:00
Robert Nelson
6cb383b2e1
Merge branch 'develop' into ipmi-recon
2015-05-26 16:49:54 -07:00
artica
eacb7300de
Auto-updated build strings.
2015-05-27 00:01:14 +02:00
Robert Nelson
e943bf0ada
Fix IPMI recon script so that it works with new style custom fields
...
Updates the IPMI recon script to pass parameters to the IPMI plugin using the
new style custom fields.
Add a field for specifying additonal options to ipmi-sensors. This is required
for IPMI v2.0 devices and when using accounts with restricted privileges.
Fix some types in the description for the recon script.
Fix a bug where the recon script never completed and kept processing the subnet
over and over due to an incorrect exit condition in the loop.
Change the packet count and timeout passed to ipmiping. The previous values
required 9 seconds per address polled. This meant it took almost 40 minutes
to scan one 256 address subnet.
2015-05-26 11:01:17 -07:00
mdtrooper
1160fd800c
Fixed the 'availability' item in report. (Merge from 5d25b7c8e6
)
2015-05-26 17:20:34 +02:00
m-lopez-f
527d5079b3
Add option to changed image of service in visualconsole:builder. tiquet:#2175
...
(cherry picked from commit ca1641a4e0
)
2015-05-26 16:01:57 +02:00
Alejandro Gallardo Escobar
584000691c
Added a new folder to the gitignore
2015-05-26 13:35:34 +02:00
Alejandro Gallardo Escobar
5906f6dd44
Re-fixed the agents filter
2015-05-26 12:07:13 +02:00
Alejandro Gallardo Escobar
d7801c2933
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/extensions/module_groups.php
pandora_console/godmode/reporting/graph_builder.graph_editor.php
pandora_console/operation/events/events_list.php
2015-05-26 10:29:38 +02:00
m-lopez-f
8349b1da92
Update translations
2015-05-26 10:20:39 +02:00
m-lopez-f
45b22fe78a
Changed text in notice of update console, tiquet: #2209
2015-05-26 09:41:31 +02:00
artica
c0bc11e50a
Auto-updated build strings.
2015-05-26 00:02:12 +02:00
Alejandro Gallardo Escobar
760bc4a308
Many fixes, most of it related with the oracle support
2015-05-25 19:54:11 +02:00
Alejandro Gallardo Escobar
23b199d7cd
Fixed the function 'events_create_event' for oracle databases
2015-05-25 19:53:20 +02:00
Alejandro Gallardo Escobar
163fcd1e09
Now the PL/SQL function 'INSERT_ID' returns the inserted id properly
2015-05-25 19:52:27 +02:00
mdtrooper
991c406a70
Fixed the 'group_report' item in metaconsole reports. TICKET: #2249
2015-05-25 16:29:51 +02:00
mdtrooper
2f23441516
Fixed the 'inventory' and 'inventory_changes' items in metaconsole reports. TICKET: #2249
2015-05-25 16:01:33 +02:00
mdtrooper
22ce2d8902
Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249
2015-05-25 13:39:27 +02:00
mdtrooper
81a0a217b5
Fixed PHP Warnings
2015-05-25 13:31:10 +02:00
mdtrooper
e401dfa8bd
Fixed the 'event_report_agent', 'event_report_group' and 'event_report_module' items in metaconsole reports. TICKET: #2249
2015-05-25 13:02:22 +02:00
m-lopez-f
2061130825
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-05-25 12:55:33 +02:00
m-lopez-f
86db63f4f9
Fixed problems with name of dynamic's worksmap. tiquet: #2207
2015-05-25 12:55:18 +02:00
mdtrooper
d943fa5b78
Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249
2015-05-25 12:46:32 +02:00
m-lopez-f
d3277b5039
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-05-25 11:58:17 +02:00
m-lopez-f
6dc62eccce
Fixed problems with new code, not view unit in graph, tiquet: 2194
...
(cherry picked from commit 2df8fab33a
)
2015-05-25 11:58:01 +02:00
mdtrooper
c713046edf
Fixed the 'sql' item in metaconsole reports. TICKET: #2249
2015-05-25 11:19:25 +02:00
m-lopez-f
c8d152c9cf
Fixed error, when type modules is Asyncronous type, tiquet: #2193
...
(cherry picked from commit 7efff21816
)
2015-05-25 10:45:21 +02:00
artica
f51a36fd3d
Auto-updated build strings.
2015-05-25 00:01:11 +02:00
artica
94e24f461a
Auto-updated build strings.
2015-05-24 00:01:10 +02:00
artica
37361f53ae
Auto-updated build strings.
2015-05-23 00:01:13 +02:00
mdtrooper
d2b094061a
Fixed the 'monitor_report' item in metaconsole reports. TICKET: #2249
2015-05-22 18:02:41 +02:00
mdtrooper
29743cfa74
Fixed the 'projection_graph' item in metaconsole reports. TICKET: #2249
2015-05-22 17:55:06 +02:00
mdtrooper
10efebee28
Removed 'SLA_services' item in metaconsole reports. TICKET: #2249
2015-05-22 17:51:43 +02:00
Alejandro Gallardo Escobar
c5ca1a263c
Fixed the filter management (load, save and update)
2015-05-22 17:48:58 +02:00
mdtrooper
cd62f8c91f
Fixed the 'max_value', 'min_value', 'avg_value', 'sumatory', 'MTTR', 'MTBF', 'TTO', 'TTRT' items in metaconsole reports. TICKET: #2249
2015-05-22 17:43:27 +02:00
mdtrooper
9f48e5eaa1
Fixed the 'custom_graph' item in metaconsole reports. TICKET: #2249
2015-05-22 17:37:07 +02:00
mdtrooper
3a213df637
Fixed PHP Warnings
2015-05-22 17:28:44 +02:00
mdtrooper
3ee4194d11
Fixed the 'simple_baseline_graph' item in metaconsole reports. TICKET: #2249
2015-05-22 17:25:56 +02:00
mdtrooper
c004c2c1b6
Fixed the 'simple_graph' item in metaconsole reports. TICKET: #2249
2015-05-22 17:05:17 +02:00
mdtrooper
8107a78791
Added support to metaconsole in function 'events_get_group_events'
2015-05-22 17:04:23 +02:00
mdtrooper
fcd6927efb
Fixed the empty list of events.
2015-05-22 15:00:06 +02:00
m-lopez-f
a19e4cdbf5
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-05-22 14:33:56 +02:00
m-lopez-f
62ff5eaef4
Add new macro Events response, tiquet:#2253
2015-05-22 14:33:43 +02:00
Alejandro Gallardo Escobar
7555963297
Now the user can delete filters with an empty name
2015-05-22 14:12:01 +02:00
mdtrooper
83967d3526
Fixed PHP Warnings
2015-05-22 13:22:12 +02:00
mdtrooper
3d32d5645e
Fixed the event list when it is setted the replication, now the info message show again.
2015-05-22 13:10:05 +02:00
mdtrooper
f009758e93
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-05-22 12:31:49 +02:00
mdtrooper
2fe85510a7
Fixed PHP Warnings.
2015-05-22 12:31:33 +02:00
m-lopez-f
50044050e1
Fixed problems with not variable initialized, tiquet: #2238
2015-05-22 12:13:22 +02:00
Alejandro Gallardo Escobar
36180716ee
Error fixes
2015-05-22 11:14:40 +02:00
Alejandro Gallardo Escobar
6a533969ef
Improved the element concatenation
2015-05-22 11:05:53 +02:00
Alejandro Gallardo Escobar
11d673b803
Added a type and a function to get the 'LISTAGG' functionality returning a CLOB instead a VARCHAR2(4000)
2015-05-22 11:04:05 +02:00
artica
0ea32ce1dc
Auto-updated build strings.
2015-05-22 00:01:13 +02:00
m-lopez-f
400cc3c587
If possible selected None own in owner event, tiquet: #2250
2015-05-21 15:23:37 +02:00
Alejandro Gallardo Escobar
33867fcc80
Fixed the function "events_get_count_events_validated"
2015-05-21 13:28:17 +02:00
m-lopez-f
d57ba03f19
Fixed problems with load events when selected all agents,tiquet: #2241
2015-05-21 13:01:44 +02:00
mdtrooper
5eb372a7ff
Moved the function 'reporting_get_stats_servers' to the correct file
2015-05-21 12:31:45 +02:00
mdtrooper
1cb3399425
Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.)
2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar
5695611ba5
Added an order field to the group events query for oracle
2015-05-21 12:18:31 +02:00
Alejandro Gallardo Escobar
b584f94b10
Successfully fixed and simplified the evil query of grouped events
2015-05-21 12:01:22 +02:00
artica
bb934257e6
Auto-updated build strings.
2015-05-21 00:01:13 +02:00
Alejandro Gallardo Escobar
3176cdfaee
Minor fixes
2015-05-20 17:37:39 +02:00
Alejandro Gallardo Escobar
6c715cf483
Fixed the search to be compatible with oracle databases
2015-05-20 17:00:18 +02:00
mdtrooper
a0dbe00f92
Some fixes in the new code of report (html)
2015-05-20 13:11:41 +02:00
m-lopez-f
1d01bd6853
Fixed problems with value pure in visual console in meta,tiquet: #2202
2015-05-20 11:50:30 +02:00
artica
0dc669178b
Auto-updated build strings.
2015-05-20 00:01:17 +02:00
Alejandro Gallardo Escobar
143243636c
Error fixes related with the improved oracle compatibility
2015-05-19 19:21:05 +02:00
Alejandro Gallardo Escobar
837667b441
Removed the information about the defined alerts for the metaconsole (again)
2015-05-19 19:20:09 +02:00
Alejandro Gallardo Escobar
137acdb232
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
Alejandro Gallardo Escobar
cfa52a655b
Finally fixed the unknown modules error, fixing the function 'UNIX_TIMESTAMP', which now returns the UTC utimestamp
2015-05-19 18:58:29 +02:00
mdtrooper
f2683594b5
Fixes in the new code of reports.
2015-05-19 17:36:47 +02:00
Ramon Novoa
c32c167b6e
Ask for the old password before letting a user renew his password.
...
(cherry picked from commit 0840c20764
)
2015-05-19 11:38:30 +02:00
artica
2896fb5324
Auto-updated build strings.
2015-05-19 00:01:15 +02:00
Alejandro Gallardo Escobar
7e67287ee0
Fixed errors related with the oracle compatibility
2015-05-18 19:06:21 +02:00
Alejandro Gallardo Escobar
b8f2daf6fa
Improved the functions that return a value
2015-05-18 19:05:22 +02:00
Alejandro Gallardo Escobar
f7867e3ce0
Fixed errors related with the oracle compatibility
2015-05-18 18:33:31 +02:00
Alejandro Gallardo Escobar
24aa40a726
Fixed errors related with the oracle compatibility
2015-05-18 18:08:14 +02:00
Alejandro Gallardo Escobar
c5d80cd104
Added history database support to the function '*_get_value_filter'
2015-05-18 18:05:09 +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 641600c9ef
)
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
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
Alejandro Gallardo Escobar
95428eea4d
Removed the .bak files and an auto generated file for the chat functionality
2015-05-14 18:19:41 +02:00
Alejandro Gallardo Escobar
eb965ff7da
Fixed the data retrieving with oracle databases
2015-05-14 17:57:59 +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
Alejandro Gallardo Escobar
b00c424af4
Fixed a lot of things, like the catastrophic problem with the sequences and the insertion triggers
2015-05-14 12:22:36 +02:00
Alejandro Gallardo Escobar
d212fd5543
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-14 11:09:37 +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
artica
7d8fe9508b
Auto-updated build strings.
2015-05-13 00:01:15 +02:00
Alejandro Gallardo Escobar
11fb9fb6e2
Many fixes and improvements in the management of the recontasks
2015-05-12 18:20:00 +02:00
Alejandro Gallardo Escobar
17c3de2b2f
Fixes related with the oracle support
2015-05-12 18:19:08 +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 43bd6e0109
.
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
Alejandro Gallardo Escobar
a106111186
Refactored the procedure 'insert_id' to make it safe for insertions without sequences in oracle
2015-05-11 20:55:58 +02:00
Alejandro Gallardo Escobar
e3ccfb95fe
Refactored to fix some errors and improve the scalability
2015-05-11 20:54:23 +02:00
Alejandro Gallardo Escobar
4ce7de723a
Now the db schema of this extension is created by processing a sql file
2015-05-11 14:18:18 +02:00
Alejandro Gallardo Escobar
f0fe255f48
Added functions to process sql scripts to add data to the pandora database
2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar
e47af5993f
Minor fix
2015-05-11 14:16:44 +02:00
Alejandro Gallardo Escobar
9c7cfad44f
Fixed some schema errors
2015-05-11 14:15:47 +02:00
Alejandro Gallardo Escobar
4cb968782c
Now the time to is different than the time from in the oncle time task
2015-05-11 14:14:30 +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
Alejandro Gallardo Escobar
6af3133d42
Fixed some error
2015-05-08 16:09:12 +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
Alejandro Gallardo Escobar
f93e861369
Improved the output of the automatic config file
2015-05-07 18:36:25 +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 cc7fcf71b3
)
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 1a035873dc
)
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 d2e57f2ec8
)
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
m-lopez-f
f5b26f69e6
Add unit to legend left in graph of interface information, tiquet: #2194
...
(cherry picked from commit 277eb655a1
)
2015-05-06 13:04:45 +02:00
artica
6f308321d4
Auto-updated build strings.
2015-05-06 00:01:12 +02:00
Ramon Novoa
0dd42fd1e0
Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle
2015-05-05 15:36:06 +02:00
Alejandro Gallardo Escobar
7bbd94843f
Changed a type
2015-05-05 16:57:39 +02:00
Ramon Novoa
c5f70a468c
Changed some default values in pandoradb.oracle.sql.
2015-05-05 15:35:47 +02:00
Alejandro Gallardo Escobar
2396ba4d9d
Added a missing serial and trigger
2015-05-05 14:05:04 +02:00
mdtrooper
c2fdcbb1d8
Working in the refactoring the code of reports (SLA_monthly).
2015-05-05 13:15:10 +02:00
artica
5dc2b6be17
Auto-updated build strings.
2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar
65a425859e
Error fixes
2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar
c02f3bacf4
Error fixes related with the improved oracle compatibility
2015-05-04 20:11:03 +02:00
Alejandro Gallardo Escobar
7ae97fa48b
Added a new function to sort an associative array by key
2015-05-04 20:10:13 +02:00
Alejandro Gallardo Escobar
c95f70dde7
Error fixes related with the improved oracle compatibility
2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar
758e11b5b0
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-04 17:40:30 +02:00
Alejandro Gallardo Escobar
a98be1cad9
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-04 17:28:42 +02:00