Commit Graph

9878 Commits

Author SHA1 Message Date
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 0b59266a61 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-04 15:45:17 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 3cd0dd60a3 Disabled a search filter when using an oracle database 2015-05-04 14:51:06 +02:00
Alejandro Gallardo Escobar 57a9d4615c Renamed a table due to the character limitation in oracle 2015-05-04 14:41:40 +02:00
Ramon Novoa cf6a26a0b5 Fixed a call to enterprise_include_once (was called before
ENTERPRISE_DIR was set).
2015-05-04 14:15:35 +02:00
m-lopez-f a12114048b add new lines to include new file in instalation agent in windows. tiquet: #2127 2015-05-04 13:45:49 +02:00
m-lopez-f 19abac33c1 Add option to change image when is service and fixed error when updated data. Tiquet: #2175 2015-05-04 12:44:46 +02:00
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
artica b9ace11dda Auto-updated build strings. 2015-05-04 00:01:09 +02:00
artica 8c2851cf7f Auto-updated build strings. 2015-05-03 00:01:08 +02:00
artica 88bb073bca Auto-updated build strings. 2015-05-02 00:01:10 +02:00
artica 2ef016b06e Auto-updated build strings. 2015-05-01 00:01:12 +02:00
Alejandro Gallardo Escobar 7c96bb7ce0 Added some missing columns 2015-04-30 20:12:05 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
mdtrooper 5545e4e616 Fixed the SLA form editor for to set graphs. TICKET: #2172
(cherry picked from commit e1e64b1a54)
2015-04-30 16:49:17 +02:00
Ramon Novoa a487fa011e Execute all previously run actions when an alert recovers. 2015-04-30 13:47:02 +02:00
m-lopez-f 2875ee5919 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-30 13:44:29 +02:00
m-lopez-f 70bca63bd6 Fixed error when read file in windows, when path containt space, tiquet: #2166 and #2114 2015-04-30 13:44:16 +02:00
Alejandro Gallardo Escobar 64466e4557 Error fix 2015-04-30 12:46:43 +02:00
Ramon Novoa 9f69bb51db Fixed a warning. 2015-04-30 11:18:44 +02:00
Ramon Novoa 665951fe07 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-04-30 10:59:36 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
Ramon Novoa 38b1f4dc8f Fixed the string quotation character for Oracle. 2015-04-30 10:51:47 +02:00
m-lopez-f 40a9958905 Delete option, in home screen, only in insterprise servers. Tiquet: #2128
(cherry picked from commit c3b60812e0)
2015-04-30 08:49:41 +02:00
artica 0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
mdtrooper 3a74ee9f15 Working in the refactoring the code of reports (SLA). 2015-04-29 19:05:06 +02:00
m-lopez-f 4f8a14a0f7 Fixed error in plugin windows not print data, tiquet: #2127 2015-04-29 17:18:19 +02:00
mdtrooper 5c2b0c0549 Working in the refactoring the code of reports (top_n). 2015-04-29 16:14:39 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
Alejandro Gallardo Escobar 0b7b32f526 Changed the type of the group name column to improve the consistency with mysql 2015-04-29 15:31:01 +02:00
m-lopez-f 47bc043a4e Fixed error to generate url for view help, tiquet: #2158
(cherry picked from commit 1423c27c0e)
2015-04-29 09:53:40 +02:00
m-lopez-f 899759a3ca Change visual 2015-04-29 08:30:02 +02:00
artica fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
Alejandro Gallardo Escobar bf23be9e6f Fixes 2015-04-28 19:10:29 +02:00
Ramon Novoa 4f2aad5834 Added a schema comparison tool. 2015-04-28 16:00:46 +02:00
Ramon Novoa 3d96e8fbf2 More fixes to SQL files. 2015-04-28 15:54:50 +02:00
m-lopez-f c50bbb7eea Change login and styles 2015-04-28 15:29:15 +02:00
Ramon Novoa e6657441d3 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-28 15:00:19 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
Alejandro Gallardo Escobar fc4f66f53f Added 'attachment/collection' to the gitignore 2015-04-28 14:37:25 +02:00
m-lopez-f 0ed625f42e Merge branch 'develop' into feature/NewView 2015-04-28 14:02:17 +02:00
m-lopez-f 885db84bd5 Delete column and change for other in list of servers. Tqiuet: #2144 2015-04-28 14:01:48 +02:00
m-lopez-f c919c294d6 Change lines for start quickly installation,tiquet: #2157
(cherry picked from commit 69affb857e)
2015-04-28 13:38:30 +02:00
m-lopez-f 69affb857e Change lines for start quickly installation,tiquet: #2157 2015-04-28 13:36:49 +02:00
m-lopez-f e093853691 Merge branch 'develop' into feature/NewView 2015-04-28 11:37:27 +02:00
artica 3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
m-lopez-f 25e5a476f0 Merge branch 'develop' into feature/CambiosInventarioTiquet#2127 2015-04-27 13:36:27 +02:00
Ramon Novoa bd1e212644 Fixed SQL files for Oracle. 2015-04-27 12:26:01 +02:00