Commit Graph

9646 Commits

Author SHA1 Message Date
m-lopez-f 036538baa9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 15:18:28 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
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
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +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
m-lopez-f 89fa37578a Changed rowspan size 2015-04-15 12:14:55 +02:00
m-lopez-f 012393d164 Changed javascript code to jquery code and fixed style 2015-04-15 12:13:47 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +02:00
m-lopez-f a77d962590 Modify styles in tactical view and tables is responsibe with window size 2015-04-15 11:28:07 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
Vanessa Gil 2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f aab9628cbd Merge branch 'develop' into feature/NewView 2015-04-15 09:38:00 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
m-lopez-f 7cb8e9dd16 Changed visual to tree view 2015-04-14 10:12:13 +02:00
m-lopez-f 1a612ff3a8 Changed style in tactical view 2015-04-14 09:56:49 +02:00
m-lopez-f b8dd9705f1 Fixed style when option of submenu is selected 2015-04-14 09:56:04 +02:00
m-lopez-f 50f15dc507 Fixed errors php in menu 2015-04-14 09:37:28 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
m-lopez-f bdbb2f3700 Merge branch 'develop' into feature/NewView 2015-04-14 08:43:46 +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 20280f5f88 Fixed visual list of servers in administrations servers
(cherry picked from commit cc03dcd127)
2015-04-13 15:06:23 +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