9579 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar
190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar
08dd1832ac Found and removed the async ajax calls (finally!). That was a very bad practice.
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
2015-04-16 13:29:23 +02:00
Alejandro Gallardo Escobar
a70d751c38 Removed the text of the agent search.
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
2015-04-16 13:16:50 +02:00
Vanessa Gil
e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00
Vanessa Gil
a0750e2b96 Fixed bug loading ajax. 2015-04-16 12:37:42 +02:00
Ramon Novoa
4f94d5bb50 Do not displayed advanced filters if custom filters are disabled. Small
fixes.
2015-04-16 11:35:20 +02:00
Ramon Novoa
79afef8cf8 Added support for metaconsole servers. 2015-04-16 11:35:20 +02:00
m-lopez-f
db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
Vanessa Gil
0899805c11 Update translations. 2015-04-15 15:34:54 +02:00
Alejandro Gallardo Escobar
afada892fe Modified the 'group_get_data' and 'group_get_group_list' to retrieve the data from the metaconsole's new agent cache table 2015-04-15 15:29:07 +02:00
Vanessa Gil
7225b61530 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 13:14:33 +02:00
Vanessa Gil
802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
m-lopez-f
2813fac10b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 12:40:05 +02:00
m-lopez-f
80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +02:00
Vanessa Gil
a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
Vanessa Gil
2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
artica
df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
m-lopez-f
21f04e6a3a Update maxlenght to password field in use detail editor, tiquet: #2098 2015-04-14 08:37:11 +02:00
artica
5533100ac4 Auto-updated build strings. 2015-04-14 00:01:14 +02:00
Vanessa Gil
4392958648 Ticket #2044. 2015-04-13 16:58:05 +02:00
m-lopez-f
85b00c080c Draw pie with filter results and changed label, tiquet: #2076 2015-04-13 15:50:49 +02:00
m-lopez-f
cc03dcd127 Fixed visual list of servers in administrations servers 2015-04-13 15:05:41 +02:00
m-lopez-f
962e7c9583 Fixed color when menu is selected 2015-04-13 13:57:15 +02:00
m-lopez-f
a34b16a938 Merge branch 'develop' into feature/NewView 2015-04-13 13:44:43 +02:00
m-lopez-f
8d8476118f reorganize menu and changed styles of menu 2015-04-13 13:44:29 +02:00
Alejandro Gallardo Escobar
8e733cf019 Merge branch 'develop' into feature/meta-agent-cache 2015-04-13 12:54:39 +02:00
m-lopez-f
9e0e996960 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 12:48:28 +02:00
m-lopez-f
b533897415 Fixed problems with print pie, show more data that data in list event,Nodo and Meta, tiquet: #2076 2015-04-13 12:47:49 +02:00
Vanessa Gil
6ed03f09dd Merge branch 'feature/sessions' into develop 2015-04-13 11:28:08 +02:00
Vanessa Gil
8600863d22 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 11:27:55 +02:00
Vanessa Gil
a7f748b7be Ticket #1354. 2015-04-13 11:27:23 +02:00
m-lopez-f
4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
m-lopez-f
eac0f87405 Fixed menu and add new option in events sub_menu 2015-04-13 09:07:52 +02:00
artica
4498d1f842 Auto-updated build strings. 2015-04-13 00:01:09 +02:00
artica
a171f76ff2 Auto-updated build strings. 2015-04-12 00:01:09 +02:00
artica
ec514cd27e Auto-updated build strings. 2015-04-11 00:01:12 +02:00
Alejandro Gallardo Escobar
7d7b6ef02f Updated the help info 2015-04-10 19:16:06 +02:00
Alejandro Gallardo Escobar
ddfb4ed2c4 Fixed a visual error 2015-04-10 14:10:12 +02:00
Alejandro Gallardo Escobar
ae080dc33b Merge branch 'feature/ticket#2047-New-acl-bits' into develop 2015-04-10 14:06:35 +02:00
Alejandro Gallardo Escobar
03f9f94e04 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-10 14:06:27 +02:00
m-lopez-f
a02acad7c4 Change visual of menu and funcionality 2015-04-10 13:43:02 +02:00
Alejandro Gallardo Escobar
10c94d51d9 Error fixes 2015-04-10 12:34:42 +02:00
Alejandro Gallardo Escobar
488c4976b0 ACL fixes 2015-04-10 12:34:19 +02:00
m-lopez-f
e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
m-lopez-f
91556f8096 Add new funcionality to menu and fixed other problems 2015-04-10 09:29:33 +02:00
artica
7286bd012f Auto-updated build strings. 2015-04-10 00:01:10 +02:00
m-lopez-f
01149f214a Changed lateral menu, order options and eliminate options 2015-04-09 15:04:23 +02:00
Alejandro Gallardo Escobar
d25c32b76d Added some lost columns to check the ACL permissions 2015-04-09 15:03:26 +02:00
m-lopez-f
a6af8ab18d Merge branch 'develop' into feature/NewView 2015-04-09 14:47:06 +02:00