Commit Graph

6 Commits

Author SHA1 Message Date
Jesús Ángel González Novez
d454a4854d Resolved git conflict 2017-11-09 16:58:54 +01:00
havidarou
345254f3df Merge branch 'dev-json-beautifier' of https://github.com/jesusgn90/wazuh-kibana-app into jesusgn90-dev-json-beautifier
Conflicts:
	public/controllers/groups.js
	public/less/common.less
	public/templates/groups-preview.html
2017-11-08 07:06:44 -05:00
Javier Castro
586cebd2d5
Merge branch '3.0-rebrand' into dev-groups-sortable 2017-11-08 12:38:41 +01:00
Jesús Ángel González Novez
91614ec9b3 Better beautifier in JSON output 2017-11-07 15:17:43 +01:00
Jesús Ángel González Novez
73026fb6b6 Add new css class to show agents list 2017-11-07 13:24:10 +01:00
Jesús Ángel González Novez
fa9479d03e Separating . less files to better organize style sheets. Created a loader of the . less files 2017-11-02 17:34:36 +01:00