From 447e8c7ad5b59e056e88866bc5aa1359044298cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 04:30:05 +0000 Subject: [PATCH 01/14] Update the project name Also remove link to the demo and use HTTPS to the docs --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ee06d2b6..4fb1ff81 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,17 @@ -![#shout-irc IRC channel on freenode](https://img.shields.io/badge/irc%20channel-%23shout--irc%20on%20freenode-blue.svg) -[![npm version](https://img.shields.io/npm/v/shout.svg)](https://www.npmjs.org/package/shout) -[![Build Status](https://travis-ci.org/erming/shout.svg?branch=master)](https://travis-ci.org/erming/shout) -[![Dependency Status](https://david-dm.org/erming/shout.svg)](https://david-dm.org/erming/shout) +![#thelounge IRC channel on freenode](https://img.shields.io/badge/irc%20channel-%23thelounge%20on%20freenode-blue.svg) +[![npm version](https://img.shields.io/npm/v/thelounge.svg)](https://www.npmjs.org/package/thelounge) +[![Build Status](https://travis-ci.org/thelounge/lounge.svg?branch=master)](https://travis-ci.org/thelounge/lounge) +[![Dependency Status](https://david-dm.org/thelounge/lounge.svg)](https://david-dm.org/thelounge/lounge) +[![devDependency Status](https://david-dm.org/thelounge/lounge/dev-status.svg)](https://david-dm.org/thelounge/lounge#info=devDependencies) -# Shout - -### [Try the Demo](http://demo.shout-irc.com/) +# The Lounge __What is it?__ -Shout is a web IRC client that you host on your own server. + +The Lounge is a web IRC client that you host on your own server. __What features does it have?__ + - Multiple user support - Stays connected even when you close the browser - Connect from multiple devices at once @@ -20,7 +21,7 @@ __What features does it have?__ ## Install ``` -sudo npm install -g shout +sudo npm install -g thelounge ``` ## Usage @@ -28,10 +29,10 @@ sudo npm install -g shout When the install is complete, go ahead and run this in your terminal: ``` -shout --help +lounge --help ``` -For more information, read the [documentation](http://shout-irc.com/docs/). +For more information, read the [documentation](https://thelounge.github.io/docs/). ## Development setup From 1b327bb9962f52c2e0a67ec9468aa9a41a7693cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 04:55:10 +0000 Subject: [PATCH 02/14] Update package.json to reflect new project naming --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 22dc2d21..faa336ac 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,14 @@ { - "name": "shout", + "name": "thelounge", "description": "The self-hosted Web IRC client", "version": "0.53.0", - "author": "Mattias Erming", "preferGlobal": true, "bin": { - "shout": "index.js" + "lounge": "index.js" }, "repository": { "type": "git", - "url": "https://github.com/erming/shout.git" + "url": "https://github.com/thelounge/lounge.git" }, "scripts": { "start": "node index", From ee508ac1ccb9c39f6a8e26c1f452e11355a34d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 05:01:50 +0000 Subject: [PATCH 03/14] Switch to new project name in CONTRIBUTING file --- CONTRIBUTING.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 96acc851..287b4acf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,28 +1,27 @@ ## Contributing -Welcome to the Shout community, it's great to have you here! We thank you in -advance for your contributions. +Welcome to The Lounge, it's great to have you here! We thank you in advance for +your contributions. ### I have a question -Find us on the #shout-irc channel. You might not get an answer right away, but -this channel is filled with nice people who will be happy to help you. +Find us on #thelounge channel on Freenode. You might not get an answer right +away, but this channel is filled with nice people who will be happy to help you. ### I want to report a bug First of all, look at the -[open issues](https://github.com/erming/shout/issues) and [closed -issues](https://github.com/erming/shout/issues?q=is%3Aissue+is%3Aclosed) -to see if this was not alredy discussed before. +[open and closed issues](https://github.com/thelounge/lounge/issues?q=is%3Aissue) +to see if this was not already discussed before. ### I want to contribute to the code A good starting point if you want to help us but do not have a clear idea of what you can do specifically is to look at the open issues labeled as [*quick and -easy*](https://github.com/erming/shout/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3A%22quick+and+easy%22) +easy*](https://github.com/thelounge/lounge/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3A%22quick+and+easy%22) or [*help -wanted*](https://github.com/erming/shout/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3A%22help+wanted%22). +wanted*](https://github.com/thelounge/lounge/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3A%22help+wanted%22). When you submit some code, make sure it respects the overall coding style that is currently in place. If you do not, our reviewers will surely let you know you @@ -46,7 +45,7 @@ article](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) on how one should format their commit messages. When you send a PR, expect two different reviews from the [project -maintainers](https://github.com/erming/shout/blob/master/CONTRIBUTING.md#project-maintainers). +maintainers](https://github.com/thelounge/lounge/blob/master/CONTRIBUTING.md#project-maintainers). If necessary, they will make comments and ask for changes. When everything looks good to them, they will both express their consent by commenting your PR with a :+1:. Typically, the first reviewer will give a thorough report and exchange @@ -54,14 +53,14 @@ with you, give his :+1:, then ask the second reviewer to confirm the changes. When this happens (when you get your second required :+1:), then your PR can be merged. -Please document any relevant changes in the shout documentation that can be -found [in its own repository](https://github.com/erming/shout-website). +Please document any relevant changes in the documentation that can be found +[in its own repository](https://github.com/thelounge/thelounge.github.io). ### Labels -When you open an [issue](https://github.com/erming/shout/issues) or send us a -[PR](https://github.com/erming/shout/pulls), it will most likely be given one or -several labels. Here is what they mean: +When you open an [issue](https://github.com/thelounge/lounge/issues) or send us +a [PR](https://github.com/thelounge/lounge/pulls), it will most likely be given +one or several labels. Here is what they mean: - **bug**: Issues that report and PRs that solve any defects that cause unexpected behaviors. From df68a1b8f0d6a363d212f6ceafeb55d63ea112c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 05:02:31 +0000 Subject: [PATCH 04/14] Update docker configuration files with new project name --- Dockerfile | 16 ++++++++-------- docker-compose.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4de8984..0d052aec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,21 +5,21 @@ FROM node:4.0-onbuild -# Create a non-root user for shout to run in. -RUN useradd --create-home shout +# Create a non-root user for lounge to run in. +RUN useradd --create-home lounge # Needed for setup of Node.js -ENV HOME /home/shout +ENV HOME /home/lounge -# Customize this to specify where Shout puts its data. -# To link a data container, have it expose /home/shout/data -ENV SHOUT_HOME /home/shout/data +# Customize this to specify where The Lounge puts its data. +# To link a data container, have it expose /home/lounge/data +ENV LOUNGE_HOME /home/lounge/data # Expose HTTP EXPOSE 9000 # Drop root. -USER shout +USER lounge # Don't use an entrypoint here. It makes debugging difficult. -CMD node index.js --home $SHOUT_HOME +CMD node index.js --home $LOUNGE_HOME diff --git a/docker-compose.yml b/docker-compose.yml index 44e6ab81..3b586543 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -shout: +lounge: build: . ports: - "9000:9000" From e079ec70d602534bb23c081ed200e92c2ed67032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 05:37:35 +0000 Subject: [PATCH 05/14] Rename client source and templates files to new project name --- .eslintignore | 2 +- Gruntfile.js | 2 +- client/index.html | 4 ++-- client/js/{shout.js => lounge.js} | 0 client/js/{shout.templates.js => lounge.templates.js} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename client/js/{shout.js => lounge.js} (100%) rename client/js/{shout.templates.js => lounge.templates.js} (100%) diff --git a/.eslintignore b/.eslintignore index 3ff6b7b1..d0fef78b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,3 @@ client/js/libs.min.js client/js/libs/**/*.js -client/js/shout.templates.js +client/js/lounge.templates.js diff --git a/Gruntfile.js b/Gruntfile.js index f4c637e7..e0f433ca 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -27,7 +27,7 @@ module.exports = function(grunt) { "node_modules/handlebars/bin/handlebars", "client/views/", "-e", "tpl", - "-f", "client/js/shout.templates.js" + "-f", "client/js/lounge.templates.js" ] }, function(err) { if (err) console.log(err); diff --git a/client/index.html b/client/index.html index cbb823ce..0033419e 100644 --- a/client/index.html +++ b/client/index.html @@ -294,8 +294,8 @@ - - + + diff --git a/client/js/shout.js b/client/js/lounge.js similarity index 100% rename from client/js/shout.js rename to client/js/lounge.js diff --git a/client/js/shout.templates.js b/client/js/lounge.templates.js similarity index 100% rename from client/js/shout.templates.js rename to client/js/lounge.templates.js From 39dc4e895768fa4e81b76b726e14de5b9dcf6ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Wed, 10 Feb 2016 05:45:21 +0000 Subject: [PATCH 06/14] Update name and link to repo to new project --- client/index.html | 8 ++++---- client/js/libs/jquery/inputhistory.js | 2 +- client/js/lounge.js | 2 +- src/client.js | 4 ++-- src/command-line/start.js | 2 +- src/helper.js | 2 +- src/plugins/irc-events/link.js | 2 +- src/server.js | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/index.html b/client/index.html index 0033419e..e7614444 100644 --- a/client/index.html +++ b/client/index.html @@ -10,7 +10,7 @@ - Shout + The Lounge @@ -34,7 +34,7 @@