Commit Graph

2987 Commits

Author SHA1 Message Date
Matej Kramny
9fd49333de Merge branch 'develop' of github.com:ansible-semaphore/semaphore into develop 2017-04-18 15:54:51 +01:00
Matej Kramny
60a6570bdc Merge pull request #299 from galexrt/improve-sql-error
Fix the primary key creation queries in v2.2.1 migration
2017-04-18 15:54:40 +01:00
Matej Kramny
5bcb34ef62 improvements for #287 2017-04-18 15:36:09 +01:00
Matej Kramny
96140045ae improve codebase after #275 2017-04-18 15:21:20 +01:00
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
Matej Kramny
9810051224 Merge pull request #321 from serkin/master
Fixes #320
2017-04-18 14:36:37 +01:00
Matej Kramny
9d65c7e81a Merge pull request #304 from z010107/master
Add JSON validation in environment model
2017-04-18 14:36:21 +01:00
Alan Campbell
7ea40d780a Merge pull request #310 from strangeman/ldap-auth
Simple authorization via LDAP
2017-04-17 01:51:13 -04:00
Alexander Serkin
214578faa3 Fixes #320 2017-04-08 12:54:06 +03:00
Anton Markelov
68f5aec9b6 make ldap searched parameters configurable 2017-04-04 22:27:06 +10:00
Anton Markelov
ce4278ae97 merge with actual master 2017-04-04 21:49:00 +10:00
Alan Campbell
e484b8eb53 Merge pull request #307 from strangeman/telegram-alerts
Telegram alerts
2017-04-01 23:58:09 -04:00
Anton Markelov
e11af62892 add logrus logging, disable LDAP username and password editing on backend 2017-03-28 11:38:53 +10:00
Anton Markelov
65dc565bd0 make go vet happy 2017-03-27 16:57:31 +10:00
Anton Markelov
09edee808e mispell 2017-03-27 16:11:09 +10:00
Anton Markelov
76715c7962 make username and password fields read-only for ldap users 2017-03-27 15:37:55 +10:00
Anton Markelov
902187167b add ldap settings to the setup process 2017-03-27 15:08:41 +10:00
Anton Markelov
308c1e64ef add simple LDAP authentification to the config and login page 2017-03-27 14:53:00 +10:00
Alan Campbell
60fb73e9af Merge pull request #298 from laeshiny/260
Rearrange list of Task Template, Inventory, Environment, Team in UI
2017-03-24 16:31:38 -04:00
Anton Markelov
ffa4d70037 add response code check for telegram 2017-03-24 17:50:26 +10:00
Anton Markelov
d95491d05d add config generation for telegram alerting 2017-03-22 18:44:37 +10:00
Anton Markelov
90d7708647 add basic telegram alerting 2017-03-22 17:22:09 +10:00
Alan Campbell
8e8e7b58d9 Merge pull request #305 from strangeman/activity-log
Add more verbosity about tasks to the Events description
2017-03-21 13:46:18 -04:00
Anton Markelov
5f956c6013 add more verbosity about tasks to the Events description 2017-03-21 12:40:00 +10:00
Andrey Krasilnikov
3a60b4c166 Add extra validation for environment JSON 2017-03-18 12:57:41 +03:00
Krasilnikov Andrey
69410bb0e8 Add JSON validation in environment model 2017-03-17 17:34:30 +03:00
Alexander Trost
afd2a720f7 Fix the primary key creation queries
Add id column to task__output table "instead"
Print error message in case of database errors
2017-03-16 17:32:42 +01:00
laeshiny
a7a2da6d78 Add sort, order parameter to Get Request of /project/id/(templates, inventory, environment, keys, repositories, users to api document 2017-03-17 00:59:33 +09:00
laeshiny
c06dffb8a2 when requesting Team, sort in ascending order by Name 2017-03-17 00:41:58 +09:00
laeshiny
c2a1165fc4 Add sort, order parameter to Get Request of "project/id/users"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) name (or username or email or admin)

- order: ordering manner
 example) asc (or desc)
2017-03-17 00:41:44 +09:00
laeshiny
53f831b131 when requesting Playbook Repositories, sort in ascending order by Name 2017-03-17 00:31:57 +09:00
laeshiny
addf6c2f1a Add sort, order parameter to Get Request of "project/id/repositories"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) name (or git_url or ssh_key)

- order: ordering manner
 example) asc (or desc)
2017-03-17 00:31:34 +09:00
laeshiny
2ac4ace2f4 Removed comment 2017-03-17 00:19:46 +09:00
laeshiny
db644f998b when requesting Key Store, sort in ascending order by Name 2017-03-17 00:18:34 +09:00
laeshiny
6c80cee3ea Add sort, order parameter to Get Request of "project/id/key"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) name (or type)

- order: ordering manner
 example) asc (or desc)
2017-03-17 00:18:16 +09:00
laeshiny
040aa1cfbd when requesting Environment, sort in ascending order by Name 2017-03-17 00:10:08 +09:00
laeshiny
dba2a44c39 Add sort, order parameter to Get Request of "project/id/environment"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) name

- order: ordering manner
 example) asc (or desc)
2017-03-17 00:09:52 +09:00
laeshiny
7196c86e61 when requesting Task Templates, sort in ascending order by Name 2017-03-16 23:56:09 +09:00
laeshiny
fa69fd13d8 Add sort, order parameter to Get Request of "project/id/inventory"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) name (or type)

- order: ordering manner
 example) asc (or desc)
2017-03-16 23:55:50 +09:00
laeshiny
b61833d4fb Add missing prefix pt to query 2017-03-16 23:53:38 +09:00
laeshiny
8f5717d15d when requesting Task Templates, sort in ascending order by Alias 2017-03-16 23:32:22 +09:00
laeshiny
d87ca8b8e3 Add sort, order parameter to Get Request of "project/id/templates"
For sorting the list, add parameters to Get Request
- sort: sorting target name
 example) alias (or playbook or ssh_key or inventory or environment or repository)

- order: ordering manner
 example) asc (or desc)
2017-03-16 23:30:41 +09:00
laeshiny
ecb1958fef Merge branch 'develop' of github.com:ansible-semaphore/semaphore into 260 2017-03-16 10:20:44 +09:00
Matej Kramny
596e8bb8b8 Merge pull request #297 from laeshiny/develop
Add copy button to "Task Templates" page
2017-03-14 18:06:55 -07:00
laeshiny
44d7750b85 correct to reformat from spaces to tabs 2017-03-15 08:06:26 +09:00
Matej Kramny
360c416a77 Merge pull request #300 from galexrt/improved-docker-entrypoint
Improve the docker entrypoint and dockerfile
2017-03-14 12:40:31 -07:00
Alexander Trost
5b68136b63 Improve the docker entrypoint and dockerfile
Improve the Dockerfile build speed and space by flattening all to one
layer

Added env var in Dockerfile for version and arch of semaphore

Show error message when the playbook path can't be created
2017-03-14 18:49:07 +01:00
laeshiny
8c30b75c57 Rearrange list of Task Template, Inventory, Environment, Team in UI
- Add "order by alias (or name)" to query of getting list in Task Template, Inventory, Environment, Team
2017-03-15 00:04:48 +09:00
laeshiny
16579df28a Add css (margin-left: 5px) to button between copy and run 2017-03-14 19:02:27 +09:00