Commit Graph

4448 Commits

Author SHA1 Message Date
Jesús Ángel
7a945cefb3 Merge branch 'master' into issue-1164 2019-02-11 09:25:27 +01:00
Jesús Ángel
9f2c762fef Merge branch '3.9-6.6' into issue-1164 2019-02-11 09:25:00 +01:00
Jesús Ángel
ead7f432fb Merge remote-tracking branch 'origin/issue-1219' 2019-02-08 17:11:40 +01:00
JuanCarlos
ec9a2a4f34 Containers height 2019-02-08 16:16:28 +01:00
Jesús Ángel
cc21a39225 Added policies 2019-02-08 15:39:00 +01:00
Jesús Ángel
353ff8cf96 Merge branch 'issue-1210' 2019-02-08 14:32:14 +01:00
Pablo
801c9c18a4 Restart manager/cluster button fixes 2019-02-08 13:59:14 +01:00
Jesús Ángel
191cb413e7 Updated API list 2019-02-08 13:01:35 +01:00
Pablo
04c20db8bc Restart manager/cluster button 2019-02-08 12:56:57 +01:00
Jesús Ángel
be928b4d12 Better error handling when different protocol is being used 2019-02-08 12:32:51 +01:00
Jesús Ángel
9a57461a8c Better error handling when different protocol is being used 2019-02-08 12:31:17 +01:00
Jesús Ángel
b2cb99a46c Merge branch 'issue-1210' 2019-02-07 19:42:58 +01:00
Jesús Ángel
985233245f Merge branch 'issue-1164' 2019-02-07 19:36:12 +01:00
Jesús Ángel
6f068347fc Updated local table directive 2019-02-07 19:35:32 +01:00
JuanCarlos
48c34bcceb Restarts running well 2019-02-07 17:25:14 +01:00
JuanCarlos
45cc5fb745 MErge 2019-02-07 13:46:58 +01:00
JuanCarlos
c662454d45 Buttons calls 2019-02-07 13:46:20 +01:00
Jesús Ángel
0d5292f7a6
Merge pull request #1215 from wazuh/issue-1198
Edit cluster configuration
2019-02-07 12:45:00 +01:00
Jesús Ángel
753d7f5db8 Added new policy-monitoring endpoints for Dev Tools 2019-02-07 10:32:24 +01:00
JuanCarlos
324f248040 Merge branch '3.9-6.6' of https://github.com/wazuh/wazuh-kibana-app into issue-1210 2019-02-07 08:28:23 +01:00
Jesús Ángel
4de009b3cc Removed console.log 2019-02-06 18:07:36 +01:00
Jesús Ángel
e6390494fc
Merge pull request #1212 from wazuh/issue-1211
Fixes and improvements cdb lists management
2019-02-06 17:46:24 +01:00
JuanCarlos
e2271bd4f0 Refactor cdb-lists 2019-02-06 17:08:01 +01:00
Jesús Ángel
74d6b78630 Replaced icon 2019-02-06 16:31:17 +01:00
Jesús Ángel
abfb15444a Merge branch '3.9-6.6' into issue-1164 2019-02-06 16:05:15 +01:00
Pablo
e7bf4182fc Fix edit cluster configuration 2019-02-06 13:41:17 +01:00
JuanCarlos
adf8db550f Provisional toaster with restart options 2019-02-06 13:04:21 +01:00
Jesús Ángel
65308d7be6 Small refactor for cdblist controller and views 2019-02-06 13:01:32 +01:00
Pablo
48f1d6e881 Merge 3.9 2019-02-06 10:58:39 +01:00
Pablo
59a5da70c6 Save cluster configuration 2019-02-06 10:56:02 +01:00
Jesús Ángel
4d8543db74
Merge pull request #1207 from wazuh/issue-1197
2nd iteration back button
2019-02-06 10:38:57 +01:00
Jesús Ángel
6cd9461cbb Yarn prettier 2019-02-06 10:38:15 +01:00
Jesús Ángel
09f24efb63 Added stringToObj as shared function 2019-02-06 10:37:48 +01:00
Jesús Ángel
dbafc45236 Merge branch '3.9-6.6' into issue-1197 2019-02-06 10:31:26 +01:00
Jesús Ángel
f9f5723266 Yarn prettier 2019-02-06 09:55:25 +01:00
Jesús Ángel
01552f0493 Yarn prettier 2019-02-06 09:54:34 +01:00
Jesús Ángel
8da852d6c8
Merge pull request #1204 from wazuh/issue-1199
2nd iteration ruleset configuration editions
2019-02-06 09:52:38 +01:00
Jesús Ángel
2c9040c639 Merge branch '3.9-6.6' into issue-1199 2019-02-06 09:51:42 +01:00
Jesús Ángel
a54b35dca9
Merge pull request #1208 from wazuh/issue-1202
Change method to resizing wazuh logo
2019-02-06 09:48:58 +01:00
JuanCarlos
14daf8ee8f UI fix 2019-02-06 09:18:07 +01:00
JuanCarlos
31ce02dc51 Fix dev-tools 2019-02-05 12:17:20 +01:00
JuanCarlos
6086cdf9d3 Fix cluster view 2019-02-05 11:47:26 +01:00
JuanCarlos
c3ead62b4a Fix injections 2019-02-05 10:22:29 +01:00
JuanCarlos
37eef5e3e6 Fail icon updated 2019-02-04 16:34:36 +01:00
JuanCarlos
6f129a48bb Fix class 2019-02-04 16:13:46 +01:00
JuanCarlos
c5ba60973b Change logo media query and delete supports 2019-02-04 15:57:19 +01:00
JuanCarlos
c4885dd4b0 Merge 3.9 2019-02-04 11:59:54 +01:00
JuanCarlos
942ece1dcd Back button improvements 2019-02-04 11:53:00 +01:00
Jesús Ángel
4d99800d17
Merge pull request #1206 from wazuh/vis-refresh
Updated some visualizations. Added missing known fields
2019-02-04 10:42:49 +01:00
Jesús Ángel
044b4ddda8 Yarn prettier 2019-02-04 10:40:19 +01:00