From 08fdbc8c56766646d3f038a3a3de1a1e8f107c4b Mon Sep 17 00:00:00 2001 From: yosssi Date: Wed, 12 Feb 2014 10:32:03 +0900 Subject: [PATCH 1/3] Fixed the overflow of the url when adding an admin user or a team member. --- cmd/droned/assets/css/drone.css | 3 +++ cmd/droned/assets/css/drone.less | 6 +++++- pkg/template/pages/admin_users_add.html | 6 +++--- pkg/template/pages/members_add.html | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cmd/droned/assets/css/drone.css b/cmd/droned/assets/css/drone.css index 0d8684d6d..3b84a14bd 100644 --- a/cmd/droned/assets/css/drone.css +++ b/cmd/droned/assets/css/drone.css @@ -1074,3 +1074,6 @@ ul.account-radio-group li img { padding: 20px; margin-bottom: 30px; } +.url { + word-break: break-all; +} diff --git a/cmd/droned/assets/css/drone.less b/cmd/droned/assets/css/drone.less index 7820bb869..a88f913f4 100644 --- a/cmd/droned/assets/css/drone.less +++ b/cmd/droned/assets/css/drone.less @@ -1260,4 +1260,8 @@ pre { padding: 20px; margin-bottom:30px; } -} \ No newline at end of file +} + +.url { + word-break: break-all; +} diff --git a/pkg/template/pages/admin_users_add.html b/pkg/template/pages/admin_users_add.html index 08d379fd1..f0d2ee750 100644 --- a/pkg/template/pages/admin_users_add.html +++ b/pkg/template/pages/admin_users_add.html @@ -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:
" + this.responseText + ""; } - $("#successAlert").text(msg); + $("#successAlert").html(msg); $("#successAlert").show().removeClass("hide"); $('#submitButton').button('reset') @@ -75,4 +75,4 @@ return false; } -{{ end }} \ No newline at end of file +{{ end }} diff --git a/pkg/template/pages/members_add.html b/pkg/template/pages/members_add.html index f3e3e0333..2d4f0ea1c 100644 --- a/pkg/template/pages/members_add.html +++ b/pkg/template/pages/members_add.html @@ -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:
" + this.responseText + ""; } - $("#successAlert").text(msg); + $("#successAlert").html(msg); $("#successAlert").show().removeClass("hide"); $('#submitButton').button('reset') } else { @@ -84,4 +84,4 @@ return false; } -{{ end }} \ No newline at end of file +{{ end }} From 58ee4b80ccd3380b334a5aba4ee54bfda0d7fd4f Mon Sep 17 00:00:00 2001 From: tomByrer Date: Wed, 12 Feb 2014 04:03:08 -0700 Subject: [PATCH 2/3] + links Helps random newbies like me not have to search :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 781018363..2a1f5d341 100644 --- a/README.md +++ b/README.md @@ -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 From ee7045bf784e147a42be6a9a0a640d00458513d5 Mon Sep 17 00:00:00 2001 From: yosssi Date: Wed, 12 Feb 2014 23:04:29 +0900 Subject: [PATCH 3/3] Added the `on_started`, `on_success`, `on_failure` properties on the notify.hipchat so that README readers can know that these properties are available. --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 781018363..e400e670e 100644 --- a/README.md +++ b/README.md @@ -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: @@ -204,7 +204,10 @@ notify: hipchat: room: support - token: 3028700e5466d375 + token: 3028700e5466d375 + on_started: true + on_success: true + on_failure: true ``` ### Docs