Commit Graph

152 Commits

Author SHA1 Message Date
malbarral
2ef2fb8ccd Bringing to front time selector in discover tabs 2017-08-22 14:13:40 +02:00
Pedro Sanchez
37451b92fc CSS, Discover templates and imports fixed for 5.5.2-3.0 2017-08-22 19:31:45 +00:00
Manuel Albarral
5603a024ec Adding cluster in API settings 2017-08-11 20:39:22 +02:00
malbarral
89ad403588 App 3.0 working with Kibana 5.4.0 2017-08-10 21:24:21 +02:00
malbarral
669d9b4b18 Restyling agent action buttons 2017-08-10 17:33:33 +02:00
malbarral
15fe4a8f70 Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into formatting-os-name-92
Conflicts:
	public/templates/agents-overview.html
2017-08-10 16:37:20 +02:00
malbarral
6e92b63aa3 Formatting OS info in manager and agent tabs 2017-08-10 16:34:37 +02:00
malbarral
c2df9f6ddc Centering cards in agent tab 2017-08-10 14:29:01 +02:00
malbarral
df6c872a05 Centering cards in agent tab 2017-08-10 14:27:07 +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
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
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
3c91c6f68b Fixing Discover sidebar styles 2017-08-01 19:29:11 +02:00
malbarral
f6e79633e8 Using ellipsis when text is too long in cards 2017-08-01 18:09:20 +02:00
malbarral
359d87ceb1 Solving some issues 2017-07-27 18:24:50 +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
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
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
f4fdece840 Minor changes were done 2017-07-10 22:56:51 +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
059cb2a796 Fixing 'no results' message and downsizing loading ring 2017-06-14 20:01:21 +02:00
root
844af23ab4 Using angularjs instead of JS code 2017-06-07 12:02:08 +02:00
Manuel
94b425d3af Adding loading ring 2017-06-02 12:07:39 +02:00
Manuel
23679368d9 Fixing setting tab for IE 2017-05-22 15:38:13 +02:00
Pedro Sanchez
ef439063b3 New agent info boxes. Syscheck/Rootcheck times 2017-04-25 05:29:44 -07:00
Pedro Sanchez
a013e17130 Welcome message 2017-02-27 05:44:03 -08:00
Pedro Sanchez
12ec30c092 Fetch agents on demand, when adding new manager. md-select css fixes. updated mapping 2017-02-23 04:53:18 -08:00
Pedro Sanchez
b3ca62cf81 More development 2017-02-14 10:33:24 -08:00
Pedro Sanchez
a3e9eb130b Card margins and positions. Server folder restructured 2017-02-10 05:53:08 -08:00
Pedro Sanchez
cfc4f14d0e Tooltip for agent SO 2017-02-07 12:35:57 -08:00
Pedro Sanchez
a194294a30 Fix Discover directive. Improve performance. Friendly URLs. Fast switching tabs 2017-02-07 08:05:53 -08:00
Pedro Sanchez
44ac6328b3 CSS Fixes. Tidy code. Improve friendly URL's for Agents tabs 2017-02-02 14:00:04 -08:00
Pedro Sanchez
9f32eb45e3 Fixes because 5.2.0 Kibana upgrade. Friendly URLs done. 2017-02-01 13:06:05 -08:00
Pedro Sanchez
cdedebcbaa Style tabbar fix 2017-01-30 10:41:11 -08:00
Pedro Sanchez
68be3510f1 Working on PCI Tab (1) 2017-01-30 07:55:55 -08:00