github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-15 16:40:06 +08:00
Code Issues Packages 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

11
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 ### System
@ -189,8 +189,8 @@ publish:
### Notifications ### Notifications
Drone can trigger email, hipchat and web hook notification at the completion Drone can trigger email, hipchat and web hook notification at the beginning and
of your build: completion of your build:
``` ```
notify: notify:
@ -204,7 +204,10 @@ notify:
hipchat: hipchat:
room: support room: support
token: 3028700e5466d375 token: 3028700e5466d375
on_started: true
on_success: true
on_failure: true
``` ```
### Docs ### Docs

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

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

6
cmd/droned/assets/css/drone.less
View File

@ -1260,4 +1260,8 @@ pre {
padding: 20px; padding: 20px;
margin-bottom:30px; margin-bottom:30px;
} }
} }
.url {
word-break: break-all;
}

6
pkg/template/pages/admin_users_add.html
View File

@ -59,9 +59,9 @@
if (this.status == 200) { if (this.status == 200) {
var msg = "User Invitation was sent successfully"; var msg = "User Invitation was sent successfully";
if (this.responseText != "OK") { 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"); $("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset') $('#submitButton').button('reset')
@ -75,4 +75,4 @@
return false; return false;
} }
</script> </script>
{{ end }} {{ end }}

6
pkg/template/pages/members_add.html
View File

@ -69,9 +69,9 @@
if (this.status == 200) { if (this.status == 200) {
var msg = "An invitation has been sent (via email) to join the Team."; var msg = "An invitation has been sent (via email) to join the Team.";
if (this.responseText != "OK") { 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"); $("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset') $('#submitButton').button('reset')
} else { } else {
@ -84,4 +84,4 @@
return false; return false;
} }
</script> </script>
{{ end }} {{ end }}