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

11415 Commits

Author SHA1 Message Date
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
m-lopez-f ccf7da77a9 Fixed warning in pandora_manage(CLI). Tiquet: #3496 2016-03-30 11:18:30 +02:00
m-lopez-f 0210afa536 Fixed problems with stop tentacle server, doen't stop all procesess. Tiquet: #3488 2016-03-30 09:21:44 +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
m-lopez-f d66db9212b Fixed problems with created modules synthetic. Tiquet: #3034 
(cherry picked from commit fcfd6e4070)
 2016-03-29 12:40:50 +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
fermin831 403e11e010 Split a delete query to avoid deadlocks TICKETS #3446 2016-03-16 15:57:45 +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