malbarral
|
c4e16906c9
|
Using material dialog
|
2017-08-02 17:49:23 +02:00 |
|
malbarral
|
4fd3c06563
|
Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into deleting-agents-preview-51
Conflicts:
public/controllers/agentsPreview.js
public/less/main.less
|
2017-08-02 17:13:32 +02:00 |
|
malbarral
|
29bd947ef3
|
Deleting unused styles
|
2017-08-02 16:55:32 +02:00 |
|
malbarral
|
ad8d510f3f
|
Minor changes
|
2017-08-02 16:52:42 +02:00 |
|
malbarral
|
ae57b1b68c
|
Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into adding-new-agent-53
Conflicts:
package.json
public/less/main.less
public/objects/genericReq.js
|
2017-08-02 16:48:18 +02:00 |
|
malbarral
|
b7bd1f7172
|
Using material design
|
2017-08-02 16:45:53 +02:00 |
|
malbarral
|
e95c26b3b0
|
Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into 2.1
|
2017-08-01 22:30:36 +02:00 |
|
malbarral
|
481c710ba9
|
Setting .load to true if there is an agent
|
2017-08-01 22:27:42 +02:00 |
|
malbarral
|
9f2667aa3b
|
Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into 2.1
|
2017-08-01 20:35:14 +02:00 |
|
malbarral
|
3c91c6f68b
|
Fixing Discover sidebar styles
|
2017-08-01 19:29:11 +02:00 |
|
malbarral
|
394e63c86d
|
Making bigger some FIM boxes
|
2017-08-01 18:16:39 +02:00 |
|
malbarral
|
f6e79633e8
|
Using ellipsis when text is too long in cards
|
2017-08-01 18:09:20 +02:00 |
|
malbarral
|
2da0b1d613
|
Fixing searchbar style in Discover tab
|
2017-08-01 15:40:08 +02:00 |
|
malbarral
|
2e85732261
|
Waiting until the info is loaded
|
2017-07-31 16:19:16 +02:00 |
|
malbarral
|
359d87ceb1
|
Solving some issues
|
2017-07-27 18:24:50 +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
|
022fd3e8bb
|
Using wazuh-elastic instead of calling directly to Elasticsearch
|
2017-07-25 17:30:19 +02:00 |
|
Manuel Albarral
|
64ad3d9de4
|
Fixing some errors
|
2017-07-24 18:37:20 +02:00 |
|
malbarral
|
6e2ba047c8
|
Importing configuration from .kibana index and using .wazuh index
|
2017-07-22 11:45:58 +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 |
|
Manuel Albarral
|
b3ffd7ef22
|
Styles were fixed
|
2017-07-21 14:48:15 +02:00 |
|
Manuel Albarral
|
bada1325ed
|
Searchbar and some styles fixed
|
2017-07-21 13:51:13 +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
|
4d175fdff9
|
Some styles were fixed
|
2017-07-20 12:26:44 +02:00 |
|
malbarral
|
fb16849e5d
|
Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1
|
2017-07-20 10:53:43 +02:00 |
|
malbarral
|
b35f566890
|
Fixing styles, controller and template
|
2017-07-20 10:32:59 +02:00 |
|
malbarral
|
e96c156531
|
New functionality to add agents
|
2017-07-20 08:22:44 +02:00 |
|
malbarral
|
38292ae3fe
|
Adding selector at the bottom and replacing some parameters
|
2017-07-18 18:04:09 +02:00 |
|
malbarral
|
b9a3a3b029
|
Deleting useless API request
|
2017-07-17 15:41:33 +02:00 |
|
malbarral
|
49d8139970
|
Using new API request
|
2017-07-17 15:37:08 +02:00 |
|
malbarral
|
f431562a16
|
Adding code to template and controller
|
2017-07-14 10:03:20 +02:00 |
|
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
|
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 |
|
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
|
3129ec2baa
|
Adding parenthesis to the query to make it works.
|
2017-06-22 15:15:18 +02:00 |
|
Manuel
|
e70dab3421
|
Controlling 'undefined' case for '$route.current.params._g'
|
2017-06-20 09:43:40 +02:00 |
|
Manuel
|
e4727f0618
|
Keeping the same parameters, erasing 'flex'
|
2017-06-08 11:26:39 +02:00 |
|
Manuel
|
f54c830496
|
IE does not support 'flex'
|
2017-06-08 11:24:12 +02:00 |
|
Manuel
|
95af1e11f1
|
Fixing typo
|
2017-06-06 12:59:03 +02:00 |
|
Jesus Linares
|
1b4b3be206
|
Merge branch '2.0' into 2.1
Conflicts:
server/api/wazuh-api.js
|
2017-06-05 17:16:53 +00:00 |
|
Manuel
|
e54de3d5a3
|
Requests were failing when the URL contained a path
|
2017-05-31 16:43:45 +02:00 |
|
Manuel
|
7adc1a3ca5
|
Getting URLs from browser session storage when it's necessary
|
2017-05-30 12:37:38 +02:00 |
|