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

4128 Commits

Author SHA1 Message Date
artica 969168ec38 Auto-updated build strings. 2015-08-08 00:01:29 +02:00
artica 4183b8c9d1 Auto-updated build strings. 2015-08-07 00:01:28 +02:00
m-lopez-f 911d474f7e Change text of relogin when change permissions when login with AD 
(cherry picked from commit a6b6fe4c30)
 2015-08-06 13:42:11 +02:00
m-lopez-f ffc3db41e6 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-08-06 13:22:56 +02:00
m-lopez-f 3aac54a84b Change help of advance permissions of AD. 2015-08-06 13:22:44 +02:00
artica c035d6b655 Auto-updated build strings. 2015-08-06 00:01:32 +02:00
mdtrooper dd9c2029e2 Added new report item 'historical data' for to get a raw data of module' 2015-08-05 14:05:53 +02:00
mdtrooper 2f98c1fc86 Added functions in modules to get table of data and raw data. 2015-08-05 14:01:37 +02:00
m-lopez-f a11af4905c Fixed problems with login with AD 2015-08-05 10:52:21 +02:00
artica 3e6d9eb98a Auto-updated build strings. 2015-08-05 00:01:27 +02:00
m-lopez-f 599adf694c Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-08-04 09:31:14 +02:00
m-lopez-f 741442009d Change form to login when permission has changed to user. Tiquet: #2566 2015-08-04 09:30:53 +02:00
artica 7f5324b6f7 Auto-updated build strings. 2015-08-04 00:01:30 +02:00
m-lopez-f 395414c1c3 Fixed problems with advance configuration permissions of Active Directory. Tiquet: #2566 2015-08-03 13:50:32 +02:00
m-lopez-f f6fed60832 Add new funcionality of remote login with Active Directory 2015-08-03 12:17:41 +02:00
crash890 4e193e1cf6 Update update_manager.ajax.php 
This would be to include proxy configuration in the download process. Without this Proxy will work to check for downloads, but the actual download does not respect the proxy settings.
(cherry picked from commit 620d8e01b8)
 2015-08-03 08:42:59 +02:00
artica 571572660d Auto-updated build strings. 2015-08-03 00:01:27 +02:00
artica 2835d2cad3 Auto-updated build strings. 2015-08-02 00:01:28 +02:00
artica 3dd7c9bf5b Auto-updated build strings. 2015-08-01 00:01:28 +02:00
artica e6799ad82b Auto-updated build strings. 2015-07-31 00:01:28 +02:00
m-lopez-f e19c002470 Fixed LDAP connection when name containt space and data login is false 
(cherry picked from commit fd7fc4eb00)
 2015-07-30 16:11:29 +02:00
artica 415a4f4373 Auto-updated build strings. 2015-07-30 00:01:29 +02:00
artica c343ca36ef Auto-updated build strings. 2015-07-29 00:01:31 +02:00
artica 2673558495 Auto-updated build strings. 2015-07-28 00:01:29 +02:00
artica 54bcc8a7a4 Auto-updated build strings. 2015-07-27 00:01:28 +02:00
artica 546fb5de11 Auto-updated build strings. 2015-07-26 00:01:27 +02:00
artica fdcd2cb1db Auto-updated build strings. 2015-07-25 00:01:29 +02:00
mdtrooper c68da1de83 Fixed the numeric format of failed % in report. 2015-07-24 15:41:39 +02:00
artica 032acc5cb3 Auto-updated build strings. 2015-07-24 00:01:28 +02:00
artica be13fa9aa4 Auto-updated build strings. 2015-07-23 00:01:33 +02:00
mdtrooper 39b667a879 Fixed the report item SLA with some configurations. 2015-07-22 16:56:06 +02:00
m-lopez-f 68b6120609 Add new options when render proc is active. Tiquet: #2503 2015-07-22 12:16:10 +02:00
artica bc6ad60373 Auto-updated build strings. 2015-07-22 00:02:25 +02:00
mdtrooper cca0c552a8 Fixed the availability item report. TICKET: #2423 2015-07-21 18:59:11 +02:00
mdtrooper 6629d0fe1c Added feature. The report items SLA, Availaibily and General do not show the not init modules. TICKET: #2510 2015-07-21 13:17:02 +02:00
mdtrooper a64f1eda1d Added function 'modules_is_not_init' 
(cherry picked from commit a8162a1876)
 2015-07-21 13:11:44 +02:00
mdtrooper 706971f763 Added a filter 'normal & critical' in severity into events. 
(cherry picked from commit f1ada9076e)

Conflicts:
	pandora_console/godmode/events/event_edit_filter.php
	pandora_console/include/constants.php
 2015-07-21 10:48:29 +02:00
artica 0460e01188 Auto-updated build strings. 2015-07-21 00:01:33 +02:00
artica 30728f04ec Auto-updated build strings. 2015-07-20 00:01:30 +02:00
artica 8eef10d85b Auto-updated build strings. 2015-07-19 00:01:31 +02:00
artica 39a0c14ea1 Auto-updated build strings. 2015-07-18 00:01:33 +02:00
mdtrooper 6aa2d6c66c Fixed the general report in metaconsole with some agents disabled. 2015-07-17 17:26:37 +02:00
m-lopez-f aeedcd0ec3 Fixed heigth in pure view when see a services map. Tiquet: #2470 2015-07-17 10:04:40 +02:00
artica 902dd189d5 Auto-updated build strings. 2015-07-17 00:02:00 +02:00
Alejandro Gallardo Escobar f01c021b14 Fixed an error in the function 'planned_downtimes_stop' 2015-07-16 15:51:05 +02:00
Alejandro Gallardo Escobar 8f3973d934 Added some useful functions from the 6.0 version 2015-07-16 15:38:15 +02:00
Alejandro Gallardo Escobar daedfa6a21 Fixed some general and ACL errors and improved some pieces of code 
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
(cherry picked from commit 4d43033d46)

Conflicts resolved:
	pandora_console/include/ajax/planned_downtime.ajax.php
 2015-07-16 15:30:21 +02:00
Alejandro Gallardo Escobar 433fa3eaef Added a function to stop a planned downtime (once type) and recover the agent and modules status 
(cherry picked from commit e8d68739b7)
 2015-07-16 15:28:28 +02:00
artica 8115724e60 Auto-updated build strings. 2015-07-16 00:01:44 +02:00
artica 44a59bdb6b Auto-updated build strings. 2015-07-15 00:01:37 +02:00
Alejandro Gallardo Escobar 289bcefbe2 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property. 
The 'attr' function is going to be deprecated an may cause errors in Firefox.
 2015-07-14 11:48:30 +02:00
artica e6e640524c Auto-updated build strings. 2015-07-14 00:01:34 +02:00
Alejandro Gallardo Escobar c5b84f1d2b Added the 'required' attribute to the input text and input text password through a function parameter 
(cherry picked from commit 4f2c35ac63)
 2015-07-13 16:25:35 +02:00
artica f67ea5c694 Auto-updated build strings. 2015-07-13 00:01:30 +02:00
artica 3e3fae2b49 Auto-updated build strings. 2015-07-12 00:01:33 +02:00
artica f2f972192f Auto-updated build strings. 2015-07-11 00:01:45 +02:00
artica 2c7c199bae Auto-updated build strings. 2015-07-10 00:01:39 +02:00
artica 36b423de7a Auto-updated build strings. 2015-07-09 00:01:42 +02:00
artica c4f58fde0b Auto-updated build strings. 2015-07-08 00:01:36 +02:00
Junichi Satoh b8a6328d6e Changed default width of the status indicator to avoid wrong tactical view 
when narrowing the browser width.
 2015-07-07 14:14:22 +09:00
Junichi Satoh 83fd7a41b1 Updated translations. 2015-07-07 12:02:33 +09:00
artica 5f6f42762a Auto-updated build strings. 2015-07-07 00:01:41 +02:00
artica 6c994a288d Auto-updated build strings. 2015-07-06 00:01:33 +02:00
artica 6533c57296 Auto-updated build strings. 2015-07-05 00:01:30 +02:00
artica be5a19c953 Auto-updated build strings. 2015-07-04 00:01:38 +02:00
Alejandro Gallardo Escobar 054401484e Now the modules SLA slicebar has a different color in the planned downtimes period 
Ticket #2341
(cherry picked from commit a512065c22)
 2015-07-03 13:18:19 +02:00
Alejandro Gallardo Escobar 480a1f3f9c Revert "Fixed SLA monthly limited ranges" because it will cause conflicts with modules in unknown state 
This reverts commit b46b9db075.
 2015-07-02 18:27:31 +02:00
fbsanchez ef787b9b4a Little css fix 2015-07-02 13:20:28 +02:00
artica 5d4fe045b0 Auto-updated build strings. 2015-07-02 00:01:47 +02:00
artica c53e281343 Auto-updated build strings. 2015-07-01 00:02:07 +02:00
fbsanchez b46b9db075 Fixed SLA monthly limited ranges 2015-06-30 18:12:53 +02:00
artica e4c1a34e30 Auto-updated build strings. 2015-06-30 00:02:04 +02:00
artica 335c4d7148 Auto-updated build strings. 2015-06-29 00:01:35 +02:00
artica 484aef4faf Auto-updated build strings. 2015-06-28 00:01:30 +02:00
artica 16f473df3d Auto-updated build strings. 2015-06-27 00:01:34 +02:00
artica c65a4226b4 Auto-updated build strings. 2015-06-26 00:01:36 +02:00
artica ec7f39d269 Auto-updated build strings. 2015-06-25 00:01:36 +02:00
Vanessa Gil 29aa79b944 Updated translations. 2015-06-24 16:49:10 +02:00
Junichi Satoh 6f4c17e788 Updated index. 2015-06-24 18:30:08 +09:00
fbsanchez 37d560a6ca Added non-interactive includes 2015-06-24 10:46:55 +02:00
artica 743f3271d8 Auto-updated build strings. 2015-06-24 00:01:59 +02:00
mdtrooper 37cb70c1e9 Fixed the title of macros in javascript. 2015-06-23 10:49:39 +02:00
artica b5e92e5054 Auto-updated build strings. 2015-06-23 00:01:38 +02:00
m-lopez-f c45206f269 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:14:03 +02:00
artica 9f561dd9d9 Auto-updated build strings. 2015-06-22 00:01:35 +02:00
artica 5c1b4cd2ca Auto-updated build strings. 2015-06-21 00:01:27 +02:00
artica 8a929ffe54 Auto-updated build strings. 2015-06-20 00:01:29 +02:00
m-lopez-f b63c3b66ec Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-06-19 14:42:31 +02:00
m-lopez-f b8b4c2d440 Fixed problems with titles in images and links 2015-06-19 14:42:18 +02:00
artica 532a5ebb4d Auto-updated build strings. 2015-06-19 00:01:33 +02:00
m-lopez-f b42678fcab Fixed problems with title in images. Tiquet:2323 2015-06-18 15:54:13 +02:00
m-lopez-f 48a3be7c80 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-06-18 13:49:03 +02:00
m-lopez-f a1257b8ad9 Ficed error with titles images 2015-06-18 13:48:23 +02:00
pandora-release 4b9352180b Updated version and build strings for the 5.1SP3 release. 2015-06-18 10:32:16 +02:00
artica 0a4f98758c Auto-updated build strings. 2015-06-18 00:01:31 +02:00
artica 205e36f66a Auto-updated build strings. 2015-06-17 00:02:00 +02:00
artica 5dd3d95887 Auto-updated build strings. 2015-06-16 00:01:30 +02:00
Alejandro Gallardo Escobar 8c5c32150c Changed the 'forced_title' feature of the function "html_print_image". Tiquet: 2197 
(cherry picked from commit 7aa4851c5b)
 2015-06-15 17:11:00 +02:00
artica ea27eae5e6 Auto-updated build strings. 2015-06-15 00:01:27 +02:00
artica bd877b0dff Auto-updated build strings. 2015-06-14 00:01:27 +02:00