mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-09-24 12:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brad Rydzewski 2014-02-12 12:23:19 -07:00
commit 901d48ee82
5 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -1,4 +1,4 @@
Drone is a Continuous Integration platform built on Docker
Drone is a [Continuous Integration](http://en.wikipedia.org/wiki/Continuous_integration) platform built on [Docker](https://www.docker.io/)
### System
@ -189,8 +189,8 @@ publish:
### Notifications
Drone can trigger email, hipchat and web hook notification at the completion
of your build:
Drone can trigger email, hipchat and web hook notification at the beginning and
completion of your build:
```
notify:
@ -205,6 +205,9 @@ notify:
hipchat:
room: support
token: 3028700e5466d375
on_started: true
on_success: true
on_failure: true
```
### Docs

3
cmd/droned/assets/css/drone.css
View file

@ -1074,3 +1074,6 @@ ul.account-radio-group li img {
padding: 20px;
margin-bottom: 30px;
}
.url {
word-break: break-all;
}

4
cmd/droned/assets/css/drone.less
View file

@ -1261,3 +1261,7 @@ pre {
margin-bottom:30px;
}
}
.url {
word-break: break-all;
}

4
pkg/template/pages/admin_users_add.html
View file

@ -59,9 +59,9 @@
if (this.status == 200) {
var msg = "User Invitation was sent successfully";
if (this.responseText != "OK") {
msg = "Email is not currently enabled. In order to invite the user, you'll need to provide them the following link: " + this.responseText;
msg = "Email is not currently enabled. In order to invite the user, you'll need to provide them the following link:<br><span class='url'>" + this.responseText + "</span>";
}
$("#successAlert").text(msg);
$("#successAlert").html(msg);
$("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset')

4
pkg/template/pages/members_add.html
View file

@ -69,9 +69,9 @@
if (this.status == 200) {
var msg = "An invitation has been sent (via email) to join the Team.";
if (this.responseText != "OK") {
msg = "Email is not currently enabled. In order to invite this team member user, you'll need to provide them the following link: " + this.responseText;
msg = "Email is not currently enabled. In order to invite this team member user, you'll need to provide them the following link:<br><span class='url'>" + this.responseText + "</span>";
}
$("#successAlert").text(msg);
$("#successAlert").html(msg);
$("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset')
} else {