11579 Commits

Author SHA1 Message Date
fermin831
747e87b87f Solved problems (deletion, edition, creation) on GIS maps Tickets #3762 2016-06-06 12:13:01 +02:00
Daniel Maya
e6c4070212 Fixed Default value .Ticket #3601
(cherry picked from commit 004b5c57b9d37eb6d419e2991519c10a43e5dccd)
2016-06-06 11:42:52 +02:00
Daniel Maya
380cafffde New development. Display lateral menus whit left click.
(cherry picked from commit 0acf4f41ebb8e589a1e2c9f81a5394db6d3f5026)
2016-06-06 11:41:00 +02:00
m-lopez-f
d0556f96c3 Fixed url in firts task of custom field
(cherry picked from commit 18ba1ed374196e5b4b5735edaaee821cf86d4feb)
2016-06-06 10:18:06 +02:00
artica
ebad98e70a Auto-updated build strings. 2016-06-06 00:01:22 +02:00
artica
4281865011 Auto-updated build strings. 2016-06-05 00:01:23 +02:00
artica
f1c4b1a041 Auto-updated build strings. 2016-06-04 00:01:24 +02:00
axl89
cb778bea65 Added os library 2016-06-03 17:09:28 +02:00
axl89
c3a9b21010 Fixed error when DEVELOPMENT env var is not set 2016-06-03 17:09:21 +02:00
axl89
23842a932e Fixed a typo 2016-06-03 17:09:12 +02:00
axl89
5bf0cafd43 Created a utils directory with some arrangements 2016-06-03 17:09:00 +02:00
axl89
17cc54aa9c Added more testing utilities 2016-06-03 17:08:50 +02:00
axl89
94ed066b31 Added test development features 2016-06-03 17:08:39 +02:00
Alejandro Gallardo Escobar
c723a34f2c Improved the visualization of the static graphs which have a little height 2016-06-03 13:29:19 +02:00
Arturo Gonzalez
3c96db8f48 Saml login. Added restiction to admin users and saml button
(cherry picked from commit 9bc9bb9cc3fd68a882c9348b1d6c2453d0a8beda)
2016-06-03 12:49:05 +02:00
Arturo Gonzalez
48bc2159fe Fixed agent serarch in metaconsole events. Ticket#3766
(cherry picked from commit 31fcab030943a70da41a4127a57cf117c0cef884)
2016-06-03 11:01:36 +02:00
m-lopez-f
55e1bc6583 Fixed problems with created Tickets with pandora. Tiquet: #3690 2016-06-03 10:12:17 +02:00
artica
ee45bd15d6 Auto-updated build strings. 2016-06-03 00:01:24 +02:00
Alejandro Gallardo Escobar
03f23f43ec Now the color of the text of the transparent area graphs will be some type of grey. Ticket #3736 2016-06-02 19:02:39 +02:00
Alejandro Gallardo Escobar
a15d45fb30 Minor visual fix 2016-06-02 18:08:15 +02:00
Alejandro Gallardo Escobar
038769eae1 Applied a reduction coefficient to the line thickness of the static line graphs. Ticket #3765 2016-06-02 18:03:04 +02:00
Daniel Maya
f5799dccf8 fixed special characters output. Ticket #3741.
(cherry picked from commit 9f2e523136514c2247026a18d7ce980da172187f)
2016-06-02 16:32:47 +02:00
Daniel Maya
f6519bca70 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-02 15:15:26 +02:00
Daniel Maya
a291eaf143 Fixed menu position. Ticket #3709.
(cherry picked from commit a42e3a310bd4bb899419301dc568c024d8e15670)
2016-06-02 15:14:28 +02:00
Alejandro Gallardo Escobar
caac294f6e Fix to print the user lines into the visual maps. Ticket #3746 2016-06-02 15:13:46 +02:00
m-lopez-f
4f9ea2a456 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-02 12:57:46 +02:00
m-lopez-f
b549ab6a35 Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549
(cherry picked from commit db8c7cb4f5dfac3a2e96fe6d8fac8d9e825d6e2d)
2016-06-02 12:57:36 +02:00
artica
8844ac8d0f Auto-updated build strings. 2016-06-02 00:01:23 +02:00
fermin831
54cc99140c Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:09:24 +02:00
fermin831
16869aa3a4 Revert "Reformuled users_can_manage_group_all Tickets #3680"
This reverts commit 417b3faba57a028bd24aa83cc5e927eb6e5524bf.
2016-06-01 18:02:49 +02:00
fermin831
417b3faba5 Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:00:14 +02:00
m-lopez-f
1c53126a4c Fixed problems with reports. Tiquet: #3682 2016-06-01 16:40:35 +02:00
m-lopez-f
46158fedfc Revert "Added the 'automatic custom graphs' in the template reports in metaconsole."
This reverts commit 447550ed500db8ad1b7502f8e5c1a3a68da1e45d.
2016-06-01 15:58:18 +02:00
m-lopez-f
ea77a5bb89 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-01 15:56:59 +02:00
mdtrooper
447550ed50 Added the 'automatic custom graphs' in the template reports in metaconsole.
(cherry picked from commit 8d54a6762acdcacd24745d1b75184cb1616888aa)
2016-06-01 15:56:37 +02:00
Alejandro Gallardo Escobar
6d55f515d6 Fixed the menu parameter of the area graph function 2016-06-01 15:02:52 +02:00
m-lopez-f
463f96f123 Fixed problems with session in pandora mobile verison. Tiquet: #3656
(cherry picked from commit decb820659e6888ac0d4b32129ee167ea5639f75)
2016-06-01 12:54:39 +02:00
Alejandro Gallardo Escobar
650b42966f Now when using the wizard the value macro are added only to the simple values as expected. Ticket #3751 2016-06-01 12:00:45 +02:00
artica
a701221376 Auto-updated build strings. 2016-06-01 00:01:22 +02:00
Alejandro Gallardo Escobar
adc2ab3b31 Removed the strange behaviour of the label size when printing a resized map 2016-05-31 17:08:34 +02:00
fermin831
df295dca48 Enlarged the text on plugins fields Tickets #3739 2016-05-31 15:31:00 +02:00
m-lopez-f
5a14da9081 Fixed pandora login in mobile version. Tiquet: #3656
(cherry picked from commit ef4597ee9476e1958dc33625bd9659a94929f2aa)
2016-05-31 13:13:30 +02:00
Alejandro Gallardo Escobar
e4357a1047 Added some space to the bottom of the vertical bars graph 2016-05-31 12:13:42 +02:00
Alejandro Gallardo Escobar
3a7ff0e93d Now the dashboard and visual console area graphs show the last and avg value in their legend 2016-05-31 11:23:47 +02:00
Arturo Gonzalez
9fc7436792 Added a function to dashboard groups checkboxes. Ticket#2598
(cherry picked from commit a4da4bbc8df7cf8387c744694a86def8dc704022)
2016-05-31 10:06:36 +02:00
artica
7aa7681ac3 Auto-updated build strings. 2016-05-31 00:01:27 +02:00
Alejandro Gallardo Escobar
6e2cddc48d Fixed the custom line thickness of the flot line graphs 2016-05-30 19:31:01 +02:00
Alejandro Gallardo Escobar
7cec21d839 Now all the graphs of the visual console are images by default 2016-05-30 18:53:15 +02:00
Alejandro Gallardo Escobar
e5b49240c7 Now the pie graph is bigger 2016-05-30 18:47:05 +02:00
Alejandro Gallardo Escobar
a2ba4acb6c Apply the fix of the area graph height only to the dashboard and the visual consoles 2016-05-30 17:55:07 +02:00