tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,347 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

8691 Commits

Author SHA1 Message Date
pandora-release 0f1b7f4c70 Updated version and build strings. 2016-04-06 15:17:51 +02:00
fermin831 932141f1bb Fixed a single error on module graphs TICKETS #3526 2016-04-06 10:30:59 +02:00
artica f3f5ce1345 Auto-updated build strings. 2016-04-06 00:01:24 +02:00
fermin831 8bb4950912 Fixed problems with undefined max interval on module graphs TICKETS #3392 2016-04-05 14:03:15 +02:00
artica 7aab28c452 Auto-updated build strings. 2016-04-05 00:01:32 +02:00
fermin831 8a63ef220e Fixed N/A warning or critical in module graphs TICKETS #3392 2016-04-04 19:02:24 +02:00
fermin831 451cb84606 Improved critical and warning superposition in module graphs TICKETS #3515 2016-04-04 18:41:37 +02:00
fermin831 c12ec81bb7 Added DB Host Access option to localhost console installation TICKETS #3363 2016-04-04 12:23:27 +02:00
fermin831 b78c5a51f4 Fixed sql fail in snmp console TICKETS #3504 2016-04-04 12:14:57 +02:00
fermin831 45e9904f11 Substituted lines for intervals in modules graphs TICKETS #3392 2016-04-04 10:06:34 +02:00
artica 693d959f1d Auto-updated build strings. 2016-04-04 00:01:22 +02:00
artica 794c2e2e1b Auto-updated build strings. 2016-04-03 00:01:22 +02:00
artica 5389e857ae Auto-updated build strings. 2016-04-02 00:01:41 +02:00
artica cff1c7423b Auto-updated build strings. 2016-04-01 00:01:35 +02:00
artica ec7e766b14 Auto-updated build strings. 2016-03-31 00:01:58 +02:00
fermin831 bb732195c8 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-03-30 14:58:24 +02:00
fermin831 fb8c15e8c0 Fixed checks in availability reports TICKETS #3449 2016-03-30 14:55:57 +02:00
mdtrooper 2f9a31c370 Some fixes in the skins. 
(cherry picked from commit 1facd4d69f)

Conflicts:
	pandora_console/include/functions_ui.php
 2016-03-30 13:20:41 +02:00
artica 6f60aa013f Auto-updated build strings. 2016-03-30 00:01:56 +02:00
Arturo Gonzalez a03815d611 Revert "Some changes in saml login system." 
This reverts commit 502988c812.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/index.php
 2016-03-29 16:40:55 +02:00
Arturo Gonzalez f59665fe4b Revert "New login method (saml). Ticket#3393" 
This reverts commit 08569e64e3.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/include/constants.php
	pandora_console/index.php
 2016-03-29 16:34:41 +02:00
mdtrooper 6215d027be Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170 
(cherry picked from commit f253a16d9b)
 2016-03-29 13:55:30 +02:00
mdtrooper a716b3aaa7 Fixed PHP Warnings. 
(cherry picked from commit 1e0e18a399)
 2016-03-29 13:53:40 +02:00
Arturo Gonzalez 502988c812 Some changes in saml login system. 
(cherry picked from commit e9eb16a848)
 2016-03-29 13:19:58 +02:00
Arturo Gonzalez 7a826e38d0 Changed data in saml login 2016-03-29 13:16:23 +02:00
Arturo Gonzalez 08569e64e3 New login method (saml). Ticket#3393 
Conflicts:
	pandora_console/include/auth/mysql.php
 2016-03-29 13:15:37 +02:00
m-lopez-f 4786db20e8 Only conecction timeout in login. Tiquet: #3485 
(cherry picked from commit d88f7a9a27)
 2016-03-29 13:04:33 +02:00
m-lopez-f 427d5da2c1 Revert "Only conecction timeout in login. Tiquet: #3485" 
This reverts commit 21b3c370b1.
 2016-03-29 13:01:53 +02:00
m-lopez-f 21b3c370b1 Only conecction timeout in login. Tiquet: #3485 2016-03-29 13:00:20 +02:00
artica c50e578ef9 Auto-updated build strings. 2016-03-29 00:01:41 +02:00
artica 738d8af0e5 Auto-updated build strings. 2016-03-28 00:01:25 +02:00
artica 70e2b2c151 Auto-updated build strings. 2016-03-27 00:01:22 +01:00
artica dd331782b8 Auto-updated build strings. 2016-03-26 00:01:39 +01:00
artica 277c17d0ed Auto-updated build strings. 2016-03-25 00:01:41 +01:00
artica 89b8cf1754 Auto-updated build strings. 2016-03-24 00:02:40 +01:00
m-lopez-f 951856d837 Re-fixed problems with visual console. Tiquet: #3492 2016-03-23 15:13:31 +01:00
m-lopez-f bff7d3ef8f Fixed problems with autoupdate enterprise in login when no connect with artica.es 
(cherry picked from commit 82174f0bae)
 2016-03-23 14:02:12 +01:00
axl89 3f065143c1 Included the Dockerfile and its dependencies for server, console and database Docker images 2016-03-23 11:46:40 +01:00
artica acd2015f51 Auto-updated build strings. 2016-03-23 00:01:28 +01:00
Hirofumi Kosaka dc6fc32c63 Fixed a bug that custom "interval values" had not been used as default 
module interval (you can add custom ones at 'visual styles' configuration).
 2016-03-22 13:25:15 +09:00
artica bf0ceeb3f1 Auto-updated build strings. 2016-03-22 00:01:46 +01:00
artica 3346f3419e Auto-updated build strings. 2016-03-21 00:01:21 +01:00
artica 1c1b657386 Auto-updated build strings. 2016-03-20 00:01:23 +01:00
artica baff36cd5d Auto-updated build strings. 2016-03-19 00:01:53 +01:00
artica 070af028f9 Auto-updated build strings. 2016-03-18 00:01:38 +01:00
fermin831 4124d198b5 Changed Time to in working time to 00:00:00 TICKETS #3480 2016-03-17 15:47:28 +01:00
fermin831 cd737db318 Solved a SLA problem on no-init modules TICKETS #3479 2016-03-17 14:23:16 +01:00
fermin831 d24c37f090 Changed Poling time to Time available in Availability reports TICKETS #3285 2016-03-17 10:56:37 +01:00
artica bd773b0328 Auto-updated build strings. 2016-03-17 00:01:37 +01:00
fermin831 775a3e4a9c Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:47:41 +01:00
artica 6af5225002 Auto-updated build strings. 2016-03-16 00:01:41 +01:00
m-lopez-f e3e549cbe8 Fixed problems with dashboard performance when include users maps. Tiquet: #3438 2016-03-15 09:25:48 +01:00
artica 1b95ed72b5 Auto-updated build strings. 2016-03-15 00:01:33 +01:00
fermin831 11ff9d46a1 Fixed some fails in SLA operation due to Working time improvement #3470 2016-03-14 15:58:41 +01:00
fermin831 64c16e9497 Removed unwanted trace 2016-03-14 12:02:03 +01:00
fermin831 bbf2ff36d9 Modified SLA to work only in working time properly. TICKETS #3370 
Graphs are modified to show without having consideration of working time
 2016-03-14 10:53:03 +01:00
artica f60522d4bf Auto-updated build strings. 2016-03-14 00:01:26 +01:00
artica 2caa93049a Auto-updated build strings. 2016-03-13 00:01:29 +01:00
artica 24313c3929 Auto-updated build strings. 2016-03-12 00:01:39 +01:00
artica 69ad6357a1 Auto-updated build strings. 2016-03-11 00:01:44 +01:00
m-lopez-f e7e91ea095 Fixed error in php with acl enterprise. Tiquet: #3457 
(cherry picked from commit 2502c26077)
 2016-03-10 10:47:47 +01:00
artica 927135627c Auto-updated build strings. 2016-03-10 00:01:43 +01:00
m-lopez-f 093d9ad313 Fixed problems with order data in custom graphs 2016-03-09 15:59:36 +01:00
artica ad4e3f3ccc Auto-updated build strings. 2016-03-09 00:01:39 +01:00
fermin831 a5222eeb6b Fixed filter agent and modules empty in events 2016-03-08 13:47:47 +01:00
Hirofumi Kosaka 4c4b7f7a36 Fixed the case "bulk module edit" had failed when selecting "Select modules first". 2016-03-08 18:10:50 +09:00
artica a92e5937a8 Auto-updated build strings. 2016-03-08 00:01:41 +01:00
Arturo Gonzalez 26a9b4d227 Fixed problem with strict acl and group view. 2016-03-07 13:55:26 +01:00
artica ed7c72a1ba Auto-updated build strings. 2016-03-07 00:01:28 +01:00
artica 4df5446413 Auto-updated build strings. 2016-03-06 00:01:23 +01:00
artica 4166ee589f Auto-updated build strings. 2016-03-05 00:01:30 +01:00
fermin831 0d239bc117 Fixed ACL problems with create scheduled downtimes to AD bit 2016-03-04 12:11:58 +01:00
artica 491ef49e13 Auto-updated build strings. 2016-03-04 00:01:48 +01:00
fbsanchez b427d9ab1f Removed "projection for" text from custom graphs 2016-03-03 13:31:38 +01:00
m-lopez-f 92b1e6ac7c Fixed problems with resize dashboard when containt map by user. Tiquet: #3373 
(cherry picked from commit afdf047bcd)
 2016-03-03 13:19:45 +01:00
m-lopez-f 8b1992169c Fixed problems with custom graphs. Ticket: #3413 2016-03-03 10:11:46 +01:00
m-lopez-f b1add36853 Fixed problems with custom graphs. Tiquet: #3413 2016-03-03 09:57:26 +01:00
Arturo Gonzalez 976f646a24 Fixed problems with strict acl in tactical view. Ticket#3440 2016-03-03 09:32:34 +01:00
artica 234185f6ba Auto-updated build strings. 2016-03-03 00:01:40 +01:00
Arturo Gonzalez ed117e3d50 Fixed error in tree view (meta and strict user with tags). Ticket #3437 2016-03-02 15:27:44 +01:00
artica 83d022e225 Auto-updated build strings. 2016-03-02 00:01:41 +01:00
Arturo Gonzalez 2d8ec851af Fixed problem with strict acl 2016-03-01 15:45:58 +01:00
Arturo Gonzalez 3840cf6698 Fixed php error in tactical view when user hace strict acl. Ticket#3411 2016-03-01 13:50:12 +01:00
fermin831 9ce0b14933 Solved open ACL reports problems 2016-03-01 10:15:33 +01:00
artica 7406ce5239 Auto-updated build strings. 2016-03-01 00:01:40 +01:00
artica dd151283c8 Auto-updated build strings. 2016-02-29 00:01:27 +01:00
artica 678d46b7c0 Auto-updated build strings. 2016-02-28 00:01:21 +01:00
artica 34dbd955d7 Auto-updated build strings. 2016-02-27 00:01:26 +01:00
artica e691e31171 Auto-updated build strings. 2016-02-26 00:01:32 +01:00
artica f612c521c0 Auto-updated build strings. 2016-02-25 00:01:35 +01:00
artica 85da481abd Auto-updated build strings. 2016-02-24 00:01:25 +01:00
artica 3b347ee56d Auto-updated build strings. 2016-02-23 00:01:51 +01:00
Hirofumi Kosaka be677467cf Fixed massive-edit-plugins to show multi-byte string values properly. 2016-02-22 17:51:24 +09:00
artica 8c72f28278 Auto-updated build strings. 2016-02-22 00:01:19 +01:00
artica 0aedfdd60e Auto-updated build strings. 2016-02-20 00:01:34 +01:00
artica 0ecaff69b4 Auto-updated build strings. 2016-02-19 00:01:38 +01:00
Arturo Gonzalez a358d59358 Fixed error in group view with father groups without user read permissions. Ticket#3395 2016-02-18 15:02:51 +01:00
Arturo Gonzalez dd30466665 Revert "New login method (saml). Ticket#3393" 
This reverts commit d373d3b3aa.
 2016-02-18 12:54:24 +01:00
Arturo Gonzalez 45d8ac18a8 Revert "Some changes in saml login system." 
This reverts commit 2c1e80d913.
 2016-02-18 12:53:39 +01:00
Arturo Gonzalez 2c1e80d913 Some changes in saml login system. 2016-02-18 12:27:48 +01:00
Arturo Gonzalez 4979305e5b Fixed group view with strict user. Ticket#3391 2016-02-18 09:17:50 +01:00
Hirofumi Kosaka 75f4884768 Fixed get_plugins API that had returned values in wrong order if updated from ver 4.x. 2016-02-18 17:00:22 +09:00
artica 8a0619bb46 Auto-updated build strings. 2016-02-18 00:01:35 +01:00
m-lopez-f 0c6e7164b8 Delete button and check of autosave, because any time save work. Tiquet: #3075 
(cherry picked from commit 9cc979e69c)
 2016-02-17 13:22:17 +01:00
Arturo Gonzalez d373d3b3aa New login method (saml). Ticket#3393 2016-02-17 13:08:26 +01:00
artica 8fe3edc29e Auto-updated build strings. 2016-02-17 00:01:21 +01:00
Arturo Gonzalez 8ed5c4ba0a Thanks god for strict acl. Ticket#3391 2016-02-16 18:05:31 +01:00
Arturo Gonzalez e2cd130124 Fixed problem in tree view with parent nodes and permissions. Ticket#3388 2016-02-16 16:30:47 +01:00
fermin831 ffb86023cf Password field in SNMP wizard v3 TICKETS #3385 2016-02-16 12:58:21 +01:00
artica 0809903849 Auto-updated build strings. 2016-02-16 00:01:25 +01:00
artica aa195fb189 Auto-updated build strings. 2016-02-15 00:01:19 +01:00
artica ac5b6c6a6b Auto-updated build strings. 2016-02-14 00:01:23 +01:00
artica 87d25f28cd Auto-updated build strings. 2016-02-13 00:01:32 +01:00
fermin831 176c973d2f Modified ACL bit from AW to AD in scheduled downtimes TICKETS #3280 2016-02-12 14:34:10 +01:00
artica a011ce4475 Auto-updated build strings. 2016-02-12 00:01:34 +01:00
fermin831 e16f3b85cb Fixed Custom Graphs deletion TICKETS #3356 2016-02-11 15:22:09 +01:00
artica dce69d4422 Auto-updated build strings. 2016-02-11 00:01:33 +01:00
artica 86ebfee90c Auto-updated build strings. 2016-02-10 00:01:22 +01:00
fermin831 ea5abefc87 Set initial status to modules pagination in agent view TICKETS #3362 2016-02-09 20:03:56 +01:00
m-lopez-f c1bb0a342b Add lost variable in funtion 
(cherry picked from commit 2ff36cc245)
 2016-02-09 10:23:47 +01:00
m-lopez-f 6f81f66082 Fixed problems with create syntethic module with API. 
(cherry picked from commit 3315b732f8)
 2016-02-09 10:23:31 +01:00
artica 2e250df54d Auto-updated build strings. 2016-02-09 00:01:27 +01:00
artica c3915cda00 Auto-updated build strings. 2016-02-08 00:01:20 +01:00
artica 984ce315ce Auto-updated build strings. 2016-02-07 00:01:19 +01:00
artica 06aae3fde0 Auto-updated build strings. 2016-02-06 00:01:25 +01:00
Arturo Gonzalez 381b9cdcdc Fixed sql error when searchs in empty father groups. Ticket#3347 2016-02-05 12:29:37 +01:00
Arturo Gonzalez 46dc03dcac Now if user can't write in groups delete button desapears. Ticket#3352 2016-02-05 10:22:14 +01:00
fermin831 b9875e8013 Fixed cron updating problem TICKETS #3329 
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
 2016-02-05 09:53:45 +01:00
Arturo Gonzalez 23902bd60e Fixed problems with acl strict in group view. Ticket#3347 2016-02-05 09:20:36 +01:00
artica 2325519ab5 Auto-updated build strings. 2016-02-05 00:01:23 +01:00
artica 5dbe46fd9d Auto-updated build strings. 2016-02-04 00:01:31 +01:00
m-lopez-f 48c56ca843 fixed problems with period in reports type avilibality. Tiquet: #3343 
(cherry picked from commit 868c5eec31)
 2016-02-03 16:29:48 +01:00
fermin831 3661e11d6e Solved Oracle escaping inteerval problems in agent view. 2016-02-03 14:10:05 +01:00
artica 28deea3186 Auto-updated build strings. 2016-02-03 00:01:32 +01:00
artica 3ff4e92619 Auto-updated build strings. 2016-02-02 00:02:02 +01:00
m-lopez-f b6a01a9d84 Fixed again count status module in Group view. Tiquet: #3289 
(cherry picked from commit f8753c2545)
 2016-02-01 16:11:34 +01:00
m-lopez-f 9f2a149600 Fixed view data in group view. Tiquet: #3289, #3297 
(cherry picked from commit d0cea38c8d)
 2016-02-01 11:52:58 +01:00
m-lopez-f 64dd3e99ad Fixed problems with count agents and modules in group view. Tiquets: #3289, #3297 2016-02-01 11:36:26 +01:00
m-lopez-f f66ef48a88 Fixed problems with strict users. Tiquet: #3308 
(cherry picked from commit f766bef9bb)
 2016-02-01 10:14:21 +01:00
artica c9f4e767ac Auto-updated build strings. 2016-02-01 00:01:22 +01:00
artica 7c5514325e Auto-updated build strings. 2016-01-31 00:01:21 +01:00
artica 2acaa3e1fa Auto-updated build strings. 2016-01-30 00:01:27 +01:00
Arturo Gonzalez 56c75d600e Fixed bug in tree when shows modules with tag configuration. Ticket#3307 2016-01-29 14:46:50 +01:00
m-lopez-f e381542ed5 Revert "Fixed problems of count agents and modules in group view. Tiquet: #3028,#3297" 
This reverts commit de680746e4.
 2016-01-29 14:24:38 +01:00
m-lopez-f de680746e4 Fixed problems of count agents and modules in group view. Tiquet: #3028,#3297 
(cherry picked from commit b274ea805b)
 2016-01-29 13:53:52 +01:00
Arturo Gonzalez 400cef90bf Fixed extra time in Tree View 2016-01-29 11:48:51 +01:00
artica d7c68ed83a Auto-updated build strings. 2016-01-29 00:01:23 +01:00
Arturo Gonzalez 4d15ee38e2 Fixed total count in group_view(meta). Ticket#3295 2016-01-28 14:41:54 +01:00
Arturo Gonzalez db28ad3e80 Fixed minor bug with Tree view. 2016-01-28 14:40:30 +01:00
Ramon Novoa 3ac548cc3b Testing the integration of webhooks with the ticketing system. Fixes 
ticket #1.
 2016-01-28 14:14:04 +01:00