tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,596 Commits 34 Branches 30 Tags
Commit Graph

9596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artica
d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
Vanessa Gil
f34c10df09 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-17 14:55:31 +02:00
Vanessa Gil
1c3f0275b1 Ticket #1353. 2015-04-17 14:54:17 +02:00
m-lopez-f
eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
Ramon Novoa
250ef13bca Remove \n and \r from event descriptions. 2015-04-17 12:43:43 +02:00
artica
332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
mdtrooper
ec39e664fa Fixed the SLA with a period have a setted a time slots. 
(cherry picked from commit c5b5d60d4ccdd93a06655cf0e4ee67bb634b2a2d)
 2015-04-16 19:21:13 +02:00
m-lopez-f
44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper
3dbd433285 Fixed the history data in boolean and string charts. 
(cherry picked from commit f24919fe4b80b61e076f8b6589e77a2fe5a9416d)
 2015-04-16 15:38:59 +02:00
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
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
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 cc03dcd127c1309def0784e2e884c22515a2fb52)
 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
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