Commit Graph

394 Commits

Author SHA1 Message Date
malbarral
df6c872a05 Centering cards in agent tab 2017-08-10 14:27:07 +02:00
malbarral
cb89a61c64 Fixing visualization filters in templates 2017-08-08 22:26:19 +02:00
root
16e231b1c1 Modifying HTML code for the new structure. 2017-08-08 15:06:08 -04:00
malbarral
f063e482d6 Using ng-show to show/hide dialog 2017-08-03 13:32:02 +02:00
malbarral
f9683041b9 Allowing to disable agents actions 2017-08-03 10:43:02 +02:00
malbarral
a68b80e4cb Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into loading-icon-17
Conflicts:
	public/controllers/agentsPreview.js
	public/directives/kibanaVisualizationDirective.js
	public/less/main.less
	public/objects/genericReq.js
	public/objects/testConnection.js
	public/templates/agents-audit.html
	public/templates/agents-fim.html
	public/templates/agents-oscap.html
	public/templates/agents-overview.html
	public/templates/agents-pci.html
	public/templates/agents-pm.html
	public/templates/overview-audit.html
	public/templates/overview-fim.html
	public/templates/overview-general.html
	public/templates/overview-oscap.html
	public/templates/overview-pci.html
	public/templates/overview-pm.html
2017-08-02 19:05:11 +02:00
malbarral
91f3cf8cc8 Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into adding-os-version-49
Conflicts:
	public/controllers/agentsPreview.js
2017-08-02 18:40:31 +02:00
malbarral
58849e30c3 Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into restarting-agents-preview-62
Conflicts:
	package.json
	public/controllers/agentsPreview.js
	public/templates/agents-preview.html
2017-08-02 18:31:40 +02:00
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
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
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
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
bf25f77ce4 Adding fuctionality to restart agents from preview tab 2017-07-26 12:50:16 +02:00
malbarral
a5ab90a0ad Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into deleting-agents-preview-51 2017-07-26 12:46:12 +02:00
Manuel Albarral
64ad3d9de4 Fixing some errors 2017-07-24 18:37:20 +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
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
bc59022f48 Adding OS version to agents filter 2017-07-13 18:22:08 +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
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
69fa0db56b Merge branch '2.1' into loading-icon-17
Conflicts:
	public/controllers/settings.js
	public/less/main.less
	public/objects/errlog.js
	public/objects/testConnection.js
2017-07-06 08:45:56 +02:00
malbarral
89ba62fa61 Changing styles to CSS and checking if os field exists 2017-07-05 13:01:07 +02:00
malbarral
24b1323ffd Adding os version and os platorm columns to agents preview 2017-07-05 10:07:10 +02:00
malbarral
6cd92a3bec Merge branch '2.1' into loading-icon-17
Conflicts:
	package.json
2017-07-04 12:10:22 +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
398546acb4 Adding loading state to agents-oscap.html 2017-07-04 09:02:03 +02:00
malbarral
519b2d0d0d Restarting loading status when switching tab 2017-07-03 17:51:46 +02:00
Manuel Albarral
88be410b0e Preventing blinking when loading 2017-07-03 15:52:51 +02:00
malbarral
ad836a76a3 Deleting ring from discover tab 2017-06-19 19:00:19 +02:00
malbarral
059cb2a796 Fixing 'no results' message and downsizing loading ring 2017-06-14 20:01:21 +02:00
malbarral
52017d0419 Improving solution using angularjs. 2017-06-13 17:29:56 +02:00
Manuel
e4727f0618 Keeping the same parameters, erasing 'flex' 2017-06-08 11:26:39 +02:00