Commit Graph

16 Commits

Author SHA1 Message Date
Matej Kramny
4b6a518b73 fixes resulting from master merge 2017-04-18 14:58:48 +01:00
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
Anton Markelov
308c1e64ef add simple LDAP authentification to the config and login page 2017-03-27 14:53:00 +10:00
Matej Kramny
ef4b1edd51 Merge pull request #294 from galexrt/sql-primary-keys
Added primary keys to the existing tables
2017-03-12 17:11:28 -07:00
Alexander Trost
bf83b7e312 Added v2.2.1 sql migration file that adds primary keys to the tables 2017-03-12 19:51:03 +01:00
Anton Markelov
4bbedac795 add alert setting for user and (WIP) project 2017-03-10 10:12:55 +10:00
Matej Kramny
6c633fdbf2 Merge branch 'master' into develop
# Conflicts:
#	api/auth.go
#	cli/main.go
#	db/Event.go
2017-03-06 11:34:10 -08:00
Matej Kramny
2a2b7e8aed merge models -> db 2017-02-22 21:12:16 -08:00
Matej Kramny
b8389f859b fix migration file 2016-11-21 17:18:44 -08:00
gcavalcante8808
bed90e2986 Alias field was not created on the DB. Corrected: added version 1.9.0. 2016-11-17 20:06:49 -02:00
gcavalcante8808
ed46338da5 Fixes #188. 2016-11-15 13:44:41 -02:00
Tokuhiro Matsuno
129af0fa17 Added dry_run button. close #152 2016-06-30 10:57:45 -04:00
Tokuhiro Matsuno
af8d0595d4 Save task executed user's ID in database.
And show user name in task information view.
2016-06-26 07:50:51 +09:00
Matej Kramny
b4cab16fda Improved UI
- Fixes #94
- Fixes admin permissions (needed to manipulate users)
2016-06-17 13:16:46 -07:00
Matej Kramny
f16b3a57e8 Fix SQL bugs
- Fixes #117
- Fixes #116
2016-06-02 19:26:51 +01:00
Matej Kramny
c58d9ac34f refactoring 2016-05-24 10:55:48 +01:00