Commit Graph

866 Commits

Author SHA1 Message Date
Manuel Albarral
2e03f85f31 Update README.md 2017-07-25 20:14:56 +02:00
Manuel Albarral
08c44c99b1 Update README.md 2017-07-25 20:14:43 +02:00
Manuel Albarral
b363324465 Update README.md 2017-07-25 20:14:15 +02:00
Manuel Albarral
43b7160aea Update README.md 2017-07-25 20:13:58 +02:00
Manuel Albarral
2f319e822d Update README.md 2017-07-25 20:13:23 +02:00
Manuel Albarral
2bac09dcfa Update package.json 2017-07-25 19:30:27 +02:00
Manuel Albarral
4c0b573b94 Update package.json 2017-07-25 19:30:12 +02:00
Manuel Albarral
ea263c1af7 Update package.json 2017-07-25 19:29:57 +02:00
Manuel Albarral
5057fc7923 Update README.md 2017-07-25 19:29:31 +02:00
Manuel Albarral
e1fdc9295d Update README.md 2017-07-25 19:29:18 +02:00
Manuel Albarral
e809c9636c Update README.md 2017-07-25 19:29:05 +02:00
Manuel Albarral
312ec89b7c Update README.md 2017-07-25 19:28:31 +02:00
Manuel Albarral
5be1177f92 Update README.md 2017-07-25 19:28:19 +02:00
Manuel Albarral
d1be1e3b7d Update package.json 2017-07-25 19:23:26 +02:00
Manuel Albarral
b2e565c7bb Update package.json 2017-07-25 19:22:30 +02:00
Manuel Albarral
2594042556 Update package.json 2017-07-25 19:22:14 +02:00
Manuel Albarral
37b140a893 Update README.md 2017-07-25 19:06:05 +02:00
malbarral
0ac9169b27 Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app into 2.1 2017-07-25 18:10:16 +02:00
malbarral
7ac6b33e44 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app 2017-07-25 18:06:52 +02:00
malbarral
89dce63034 Using .wazuh index instead of .kibana index 2017-07-25 18:02:38 +02:00
malbarral
4ddab90332 Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-07-25 18:00:25 +02:00
malbarral
f1f70ab636 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-25 17:57:28 +02:00
Manuel Albarral
518fe7b1df Merge pull request #61 from wazuh/using-wazuh-index-60
Importing configuration from .kibana index and using .wazuh index
2017-07-25 17:54:06 +02:00
Pedro Sanchez
497fc7ace0 Update CHANGELOG.md 2017-07-25 08:47:32 -07:00
malbarral
022fd3e8bb Using wazuh-elastic instead of calling directly to Elasticsearch 2017-07-25 17:30:19 +02:00
Manuel Albarral
8fc4cfcf73 Update CHANGELOG.md 2017-07-25 11:58:06 +02:00
Manuel Albarral
b7b1e6e349 Create CHANGELOG.md 2017-07-25 11:57:28 +02:00
Manuel Albarral
64ad3d9de4 Fixing some errors 2017-07-24 18:37:20 +02:00
malbarral
ca28a8bb0f Minor change was done to fix a migration issue 2017-07-24 09:27:32 +02:00
malbarral
6e2ba047c8 Importing configuration from .kibana index and using .wazuh index 2017-07-22 11:45:58 +02:00
Manuel Albarral
c9c9d0dff0 Update package.json 2017-07-21 18:47:47 +02:00
Manuel Albarral
b923b2ab5f Update package.json 2017-07-21 18:47:28 +02:00
Manuel Albarral
9576c2ef55 Update package.json 2017-07-21 18:47:10 +02:00
Manuel Albarral
6790a45f73 Update package.json 2017-07-21 18:46:48 +02:00
Manuel Albarral
83798b65b3 Update package.json 2017-07-21 18:46:08 +02:00
malbarral
bd9e54e0c6 Fixing searchbar and styles 2017-07-21 15:10:17 +02:00
malbarral
97041d7c10 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-07-21 15:03:33 +02:00
malbarral
130679e801 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-21 15:01:13 +02:00
Manuel Albarral
ab80e5ca28 Merge pull request #59 from wazuh/fixing-searchbar-57
Styles were fixed
2017-07-21 14:52:38 +02:00
Manuel Albarral
b3ffd7ef22 Styles were fixed 2017-07-21 14:48:15 +02:00
Manuel Albarral
3fb9dcd8ec Merge pull request #58 from wazuh/fixing-searchbar-57
Searchbar and some styles fixed
2017-07-21 13:53:58 +02:00
Manuel Albarral
bada1325ed Searchbar and some styles fixed 2017-07-21 13:51:13 +02:00
malbarral
54088ae0fd Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app into 2.1 2017-07-20 12:37:14 +02:00
malbarral
d5127dc6f8 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.0 2017-07-20 12:34:28 +02:00
malbarral
c12cff243a Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-07-20 12:30:58 +02:00
malbarral
cab29eae21 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-20 12:30:36 +02:00
Manuel Albarral
a30a1b6c48 Merge pull request #56 from wazuh/fixing-discover-tab-54
Some styles were fixed
2017-07-20 12:28:56 +02:00
malbarral
4d175fdff9 Some styles were fixed 2017-07-20 12:26:44 +02:00
malbarral
83e663780d Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app into 2.1 2017-07-20 11:02:22 +02:00
malbarral
9ccb6761dc Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app into 2.0 2017-07-20 10:59:59 +02:00