Commit Graph

637 Commits

Author SHA1 Message Date
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
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
malbarral
022fd3e8bb Using wazuh-elastic instead of calling directly to Elasticsearch 2017-07-25 17:30:19 +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
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
malbarral
bd9e54e0c6 Fixing searchbar and styles 2017-07-21 15:10:17 +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
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
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
9ccb6761dc Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app into 2.0 2017-07-20 10:59:59 +02:00
malbarral
9bc06072be Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-20 10:57:53 +02:00
malbarral
41dc931a93 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-20 10:52:21 +02:00
Manuel Albarral
862ec1b1ab Update package.json 2017-07-20 10:36:09 +02:00
Manuel Albarral
f81d59e10c Merge pull request #55 from wazuh/fixing-discover-tab-54
Fixing styles, controller and template
2017-07-20 10:34:51 +02:00
malbarral
b35f566890 Fixing styles, controller and template 2017-07-20 10:32:59 +02:00
malbarral
2f029af64d Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev 2017-07-12 12:29:30 +02:00
Manuel Albarral
6da97bdf3b Update README.md 2017-07-11 13:59:42 +02:00
Manuel Albarral
00c340fa78 Update README.md 2017-07-11 13:59:26 +02:00
Manuel Albarral
703463198c Update README.md 2017-07-11 13:58:57 +02:00
Manuel Albarral
29bdc1be68 Update README.md 2017-07-11 13:58:20 +02:00
malbarral
69bd58fb4a Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app 2017-07-11 13:32:03 +02:00
malbarral
f60b71e3fa Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.0 2017-07-11 13:29:47 +02:00
Manuel Albarral
5d5417831b Merge pull request #48 from wazuh/suporting-kibana-5-5-0-47
Fixing compatibility issues
2017-07-11 13:19:06 +02:00
malbarral
280baa423f Fixing styles for MS Edge 2017-07-11 12:36:24 +02:00
malbarral
051045ee86 Closing some HTML tags 2017-07-10 23:26:40 +02:00
malbarral
f4fdece840 Minor changes were done 2017-07-10 22:56:51 +02:00
malbarral
8c38354cf8 Yet another compatibility fix 2017-07-10 22:05:48 +02:00
malbarral
6846b69a69 Fixing compatibility issues 2017-07-10 21:18:51 +02:00
malbarral
1b23d92ff2 Merge branch '2.0' 2017-06-30 08:24:42 +02:00
malbarral
cf42c74d3e Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app 2017-06-30 08:22:52 +02:00
malbarral
ee46f0e5a2 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.0 2017-06-30 08:21:42 +02:00
Manuel Albarral
276d4ad079 Merge pull request #44 from wazuh/deleting-api-version-43
Deleting api-version from headers
2017-06-30 08:17:26 +02:00
malbarral
d0ffd053e7 Deleting api-version from headers 2017-06-29 11:30:51 +02:00
Manuel Albarral
5a814cee2d Update README.md 2017-06-28 09:31:45 +02:00
Manuel Albarral
6bc368d5dd Update README.md 2017-06-28 09:31:27 +02:00
Manuel Albarral
011997655b Update README.md 2017-06-28 09:31:05 +02:00
Manuel Albarral
ffc0bd91eb Update README.md 2017-06-28 09:30:42 +02:00
Manuel
012dd91510 Merge branch '2.0' 2017-06-28 08:45:33 +02:00
Manuel
3a3dc2a318 Merge branch '2.0' 2017-06-28 08:43:55 +02:00
Manuel Albarral
652b34f6a4 Update package.json 2017-06-28 08:41:10 +02:00
Manuel Albarral
180807c0e8 Update package.json 2017-06-28 08:36:54 +02:00
Manuel
007e199830 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.0 2017-06-28 07:40:08 +02:00