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

6887 Commits

Author SHA1 Message Date
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 c7aabdb6f1 Fixed syntax and ACL errors and improved some pieces of code 
Some of the ACL checks added are:
-Permission check before stopping.
-Running check before deleting.
-Permission check before deleting.
-Permission check before adding specific table columns.
(cherry picked from commit 95d0794ae0)
 2015-07-16 15:28:50 +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
Alejandro Gallardo Escobar 245b88d103 Minos changes and improvements 
(cherry picked from commit 970be457d6)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.export_csv.php
 2015-07-16 15:27:48 +02:00
Arturo Gonzalez Diaz 019f203213 Planned downtime editor changed. Ticket #2404 
(cherry picked from commit 52619f4e7c)
 2015-07-16 15:26:51 +02:00
Arturo Gonzalez Diaz 49ad7477c3 Planned downtime list and edit changed. Ticket #2404 
(cherry picked from commit 12334a3cd1)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.editor.php
 2015-07-16 15:26:11 +02:00
Arturo Gonzalez Diaz f654d6567b Planned downtime export csv changed. Ticket #2404 
(cherry picked from commit ca1c6c0bf2)
 2015-07-16 15:18:10 +02:00
Arturo Gonzalez Diaz 492dc420f8 Planned downtime list changed. Ticket #2404 
(cherry picked from commit 595ffe8f5c)
 2015-07-16 15:17:57 +02:00
Arturo Gonzalez Diaz 14e785a689 Change permissions to a non-privilege user in planned-downtimes-acl Ticket #2404 
(cherry picked from commit 8906e050ae)
 2015-07-16 15:17:20 +02:00
Arturo Gonzalez Diaz 88a53868aa Acces to non-privilege user to planned downtime 
(cherry picked from commit bbbddf2fff)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.list.php
 2015-07-16 15:16:40 +02:00
artica 8115724e60 Auto-updated build strings. 2015-07-16 00:01:44 +02:00
m-lopez-f 9c64dfdc5a Add more width to field for separate selct to botton. Tiquet: #2445 2015-07-15 15:25:30 +02:00
m-lopez-f c4a598890a Fixed problems with user edit when change language,see all fields in home screen. Tiquet: #2448 
(cherry picked from commit bc54629604)
 2015-07-15 15:09:39 +02:00
Arturo Gonzalez Diaz d33b097a4b Password box in plugin module IPMI fixed. Ticket #2409 2015-07-15 11:55:24 +02:00
artica 44a59bdb6b Auto-updated build strings. 2015-07-15 00:01:37 +02:00
mdtrooper 506b9fa944 Fixed adition of the snmp actions alerts. TICKET: #2417 
(cherry picked from commit 46516385e9)
 2015-07-14 14:07:52 +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 b45aa94e02 Now the name input field has validation for the required property 2015-07-13 16:27:21 +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
Arturo Gonzalez Diaz 73e0e91647 Export to csv whit non-privilege user. Ticket #2404 2015-07-13 13:31:57 +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
Arturo Gonzalez Diaz f5cb3c5c79 Change acl bits. Ticket #2404 2015-07-10 15:28:30 +02:00
artica 2c7c199bae Auto-updated build strings. 2015-07-10 00:01:39 +02:00
m-lopez-f f513c5e21e Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-07-09 11:14:19 +02:00
m-lopez-f 9cca442a8f Fixed problems to show groups fathers-childs in custom reports. Tiquet: #2351 
(cherry picked from commit 6f89828c76)
 2015-07-09 11:13:38 +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
Alejandro Gallardo Escobar c93d30878b Fixed an error which causes a weird update counter 2015-07-07 17:44: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