malbarral
|
d2b50eb09e
|
Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1
Conflicts:
public/less/main.less
|
2017-07-12 12:32:36 +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
|
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 |
|
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 |
|
Pedro Sanchez
|
efe0004cf9
|
Adding os version and os platorm columns to agents preview
|
2017-07-05 17:04:14 +02:00 |
|
Pedro Sanchez
|
3601193517
|
Fix recursive call
Fix recursive call
|
2017-07-05 17:03:58 +02:00 |
|
malbarral
|
89ba62fa61
|
Changing styles to CSS and checking if os field exists
|
2017-07-05 13:01:07 +02:00 |
|
malbarral
|
b3c33bb1da
|
Using instead of genericReq when needed
|
2017-07-05 11:09:27 +02:00 |
|
malbarral
|
24b1323ffd
|
Adding os version and os platorm columns to agents preview
|
2017-07-05 10:07:10 +02:00 |
|
malbarral
|
596d11e65a
|
Merge remote-tracking branch 'origin' into 2.1
Conflicts:
server/wazuh-monitoring.js
|
2017-07-04 12:04:44 +02:00 |
|
malbarral
|
1b23d92ff2
|
Merge branch '2.0'
|
2017-06-30 08:24: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
|
012dd91510
|
Merge branch '2.0'
|
2017-06-28 08:45:33 +02:00 |
|
Manuel Albarral
|
180807c0e8
|
Update package.json
|
2017-06-28 08:36:54 +02:00 |
|
Manuel Albarral
|
08967c0ae0
|
Merge pull request #42 from wazuh/getting-version-from-package-41
Using package.json instead of elasticRequest to get App version
|
2017-06-27 20:35:22 +02:00 |
|
malbarral
|
4e782f9baf
|
Using package.json instead of elasticRequest to get App version
|
2017-06-27 20:28:28 +02:00 |
|
Manuel
|
859057b635
|
Merge branch '2.0'
|
2017-06-27 11:09:19 +02:00 |
|
Pedro Sanchez
|
a71ef08d70
|
Adding App version headers when sending requests to Wazuh API
|
2017-06-26 22:28:17 +02:00 |
|
malbarral
|
fcc8933680
|
Minor change was done
|
2017-06-26 19:22:55 +02:00 |
|
malbarral
|
64deb31ff6
|
Adding App version to Api request headers
|
2017-06-26 19:10:24 +02:00 |
|
Manuel Albarral
|
1958f2510f
|
Update package.json
|
2017-06-26 10:55:08 +02:00 |
|
Pedro Sanchez
|
30cb219a80
|
Patching API version within the App
|
2017-06-23 20:26:24 +02:00 |
|
malbarral
|
a57cc09835
|
Merge branch '2.0' into supporting-api-2-0-0-32
|
2017-06-23 20:24:18 +02:00 |
|
malbarral
|
c5350eb8b5
|
Adding the fix to support the API 2.0.0 in wazuh-api.js too
|
2017-06-23 20:15:35 +02:00 |
|
malbarral
|
9143d5059d
|
Minor change was done
|
2017-06-22 23:26:17 +02:00 |
|
malbarral
|
f3797e6136
|
Minor changes were done
|
2017-06-22 23:23:56 +02:00 |
|
malbarral
|
7aa2e4aa5d
|
Using fs.exists instead of fs.open
|
2017-06-22 23:10:44 +02:00 |
|
malbarral
|
80c49b4a4a
|
Using temporal file to use the right version
|
2017-06-22 23:06:14 +02:00 |
|
malbarral
|
cf2c13616a
|
Adding 'version_patched' and changing cron to 10 minutes
|
2017-06-22 17:36:37 +02:00 |
|
Pedro Sanchez
|
cfe7d99cda
|
Adding parenthesis in searchBar Directive query
|
2017-06-22 16:35:45 +02:00 |
|
malbarral
|
3129ec2baa
|
Adding parenthesis to the query to make it works.
|
2017-06-22 15:15:18 +02:00 |
|
Manuel Albarral
|
5df99aacfe
|
Update package.json
|
2017-06-22 09:09:41 +02:00 |
|
Manuel Albarral
|
9d9ea444ab
|
Update README.md
|
2017-06-22 09:09:07 +02:00 |
|
Manuel Albarral
|
95aa1c7941
|
Update package.json
|
2017-06-21 11:46:47 +02:00 |
|
Manuel Albarral
|
836544f751
|
Update README.md
|
2017-06-21 11:13:11 +02:00 |
|
Manuel Albarral
|
299f8f851f
|
Update README.md
|
2017-06-21 11:12:30 +02:00 |
|
Manuel Albarral
|
328e152d0a
|
Merge pull request #36 from wazuh/revert-35-updating-kibana-5-4-2
Revert "Updating Kibana and API version to make the APP works"
|
2017-06-21 09:58:55 +02:00 |
|
Manuel Albarral
|
8f0adee279
|
Revert "Updating Kibana and API version to make the APP works"
|
2017-06-21 09:58:42 +02:00 |
|
Jose Luis
|
6fdb1bb453
|
Merge pull request #35 from wazuh/updating-kibana-5-4-2
Updating Kibana and API version to make the APP works
|
2017-06-21 09:04:15 +02:00 |
|
malbarral
|
cb6087c3d1
|
Updating Kibana version and API version to make the APP works with the API 2.0.0
|
2017-06-21 08:57:42 +02:00 |
|
malbarral
|
6554579afc
|
Updating wazuh version automatically when needed
|
2017-06-20 16:51:14 +02:00 |
|