Matej Kramny db4948cb89 Merge branch 'master' into develop ... # Conflicts: # Dockerfile # api/login.go # api/projects/environment.go # api/projects/project.go # api/projects/templates.go # api/tasks/runner.go # api/users.go # db/versionHistory.go # util/bindata.go		2017-04-18 14:48:31 +01:00
..
dashboard.js	parse time with momentjs - fix #197	2016-12-21 19:12:53 +09:00
edit.js	add alert setting for project	2017-03-10 16:25:42 +10:00
environment.js	when requesting Environment, sort in ascending order by Name	2017-03-17 00:10:08 +09:00
inventory.js	when requesting Task Templates, sort in ascending order by Name	2017-03-16 23:56:09 +09:00
keys.js	when requesting Key Store, sort in ascending order by Name	2017-03-17 00:18:34 +09:00
repositories.js	when requesting Playbook Repositories, sort in ascending order by Name	2017-03-17 00:31:57 +09:00
schedule.js	Project ui, ws	2016-04-02 13:40:07 +01:00
taskRunner.js	Added dry_run button. close #152	2016-06-30 10:57:45 -04:00
templates.js	when requesting Task Templates, sort in ascending order by Alias	2017-03-16 23:32:22 +09:00
users.js	when requesting Team, sort in ascending order by Name	2017-03-17 00:41:58 +09:00