Commit Graph

5118 Commits

Author SHA1 Message Date
JocelynDelalande
a25cd00741 State that we prefer rebasing over merging PRs 2015-12-01 23:14:50 +01:00
Jérémie Astori
e3d68f2fb0 Merge pull request #547 from erming/jd-quoteshedding
Allow simple-quotes strings if it avoids escaping
2015-12-01 16:26:41 -05:00
JocelynDelalande
87277e251e Allow simple-quotes strings if it avoids escaping 2015-12-01 22:19:55 +01:00
JocelynDelalande
8a80ee343d Merge pull request #519 from lyra833/escape-channel
Fixed a bug preventing logging
2015-12-01 22:09:13 +01:00
Jérémie Astori
c8a696b04e Merge pull request #503 from olivierlambert/master
Limit preview for large image files
2015-11-22 18:38:44 -05:00
Paul Friederichsen
62f56fed8a Merge pull request #526 from williamboman/feat/editorconfig
Add .editorconfig
2015-11-12 00:47:51 -06:00
Paul Friederichsen
56bed55103 Merge pull request #536 from jancborchardt/patch-1
fix development setup command, fix #535
2015-11-09 11:25:17 -06:00
Jan-Christoph Borchardt
936bb8141d fix development setup command, fix #535 2015-11-09 17:11:21 +01:00
Olivier Lambert
e5858744a2 Limit preview for large image files (fix #500) 2015-11-09 10:07:47 +01:00
JocelynDelalande
9572bbd65d Merge pull request #477 from bencevans/docker
Add a Dockerfile
2015-11-04 20:25:47 +01:00
JocelynDelalande
ba36c4ed80 Merge pull request #522 from williamboman/fix/grunt-cli
package.json: add `grunt-cli`
2015-10-27 23:09:40 +01:00
JocelynDelalande
5bfc39bbc9 Merge pull request #504 from williamboman/feat/code-style
Enforce coding style
2015-10-27 23:07:41 +01:00
William Boman
b9121d8321 Add .editorconfig
http://editorconfig.org/
2015-10-26 03:03:12 +01:00
William Boman
12ba15acf2 package.json: add linting to test script 2015-10-26 03:01:47 +01:00
William Boman
8fdfd70c7e Comply with ESLint 2015-10-26 03:01:47 +01:00
William Boman
a69992f6b2 Add .eslintrc 2015-10-26 03:01:45 +01:00
Ben Evans
5d8669112d Added @Xe's tips on the Dockerfile
https://github.com/Shuo-IRC/Shuo/pull/87
2015-10-24 20:45:44 +01:00
JocelynDelalande
1a68e96c87 Merge pull request #523 from erming/astorije/floogulinc-as-maintainer
Add @floogulinc as a project maintainer
2015-10-21 07:47:17 +02:00
Jérémie Astori
15415967a1 Add @floogulinc as a project maintainer
Welcome Paul!!
2015-10-20 23:50:28 -04:00
William Boman
f2c40234d3 package.json: add grunt-cli
This is needed to run npm scripts that uses grunt.
2015-10-19 13:22:59 +02:00
Jérémie Astori
54622e7861 0.52.0 2015-10-19 04:29:31 +00:00
Jérémie Astori
4ae8248200 Use Node 0.12 to deploy as npm shipping with 0.10 is not compatible for deployment anymore... 2015-10-19 04:29:11 +00:00
Jérémie Astori
6b226335ed Fix wrong npm token 2015-10-19 04:24:38 +00:00
Jérémie Astori
bf5d603e7a Merge pull request #520 from astorije/astorije/deployment
Set up automatic deployments
2015-10-18 23:57:47 -04:00
Jérémie Astori
a3680ce9ef Set up automatic deployments on npm
Travis CI will deploy on npm after a build is successful
2015-10-19 03:51:38 +00:00
Jérémie Astori
9532d1ff39 Add Node.js 4.2 to the list of versions tested by Travis CI 2015-10-19 03:42:47 +00:00
JocelynDelalande
f4a6f46bcc Merge pull request #518 from floogulinc/fix-autocomplete
Turn back on input autocomplete
2015-10-15 20:20:28 +02:00
Jérémie Astori
344e256054 Merge pull request #507 from floogulinc/fix-themes
Fix Morning and Zenburn themes on mobile
2015-10-14 22:23:48 -04:00
Alexander Gould
0d6b3b00c3 slashes are replaced with %'s when writing log files 2015-10-14 19:53:27 -04:00
Paul Friederichsen
b25905fb08 Revert "Turn off input autocomplete"
This reverts commit d5fe68b27e.
2015-10-12 12:59:35 -05:00
JocelynDelalande
4561ce88e6 Merge pull request #513 from astorije/astorije/contributing
Add a CONTRIBUTING.md file
2015-10-10 12:42:24 +02:00
Jérémie Astori
9f7f0f74fb List project maintainers in the CONTRIBUTING file 2015-10-10 00:52:02 +00:00
JocelynDelalande
f172db7a99 Merge pull request #511 from olivierlambert/npm-scripts
add npm build script and update the doc accordingly
2015-10-08 11:01:49 +02:00
Jérémie Astori
75cef25d20 Merge pull request #449 from vtduncan/referrer-protection
Prevent browsers leaking referrer headers
2015-10-08 00:15:36 -04:00
Jérémie Astori
1671858e9c Be more explicit on the process workflow in the CONTRIBUTING file 2015-10-08 03:58:26 +00:00
Jérémie Astori
7e2daebd79 Merge pull request #481 from williamboman/fix/chat-clear-prevent-default
client/js/shout.js: prevent default action when clearing chat
2015-10-07 22:58:14 -04:00
Olivier Lambert
9e98d01255 remove useless Grunt instruction in the doc 2015-10-07 14:51:00 +02:00
JocelynDelalande
4c23b46390 Merge pull request #515 from astorije/astorije/verbatim-license
Switch license to verbatim, raw text format
2015-10-07 14:28:57 +02:00
Jérémie Astori
6f2b9d81d4 Switch license to verbatim, raw text format 2015-10-07 11:56:26 +00:00
Jérémie Astori
8b6167b227 Merge pull request #474 from astorije/astorije/user-list-icon
Replace menu icon with users icon for userlist toggle and smooth the 2 icons
2015-10-07 07:26:34 -04:00
William Boman
c66a3917cb client/js/shout.js: prevent default action, don't overshadow native keyboard shortcut
Closes #453.
2015-10-07 12:34:25 +02:00
Jérémie Astori
9afa0ce2d1 Add a paragraph on documentation
Taken from #358
2015-10-07 03:30:53 +00:00
Jérémie Astori
9de191c8a4 Add second review needed label to the CONTRIBUTING label description 2015-10-07 03:28:01 +00:00
Jérémie Astori
201938cd71 Add CONTRIBUTING paragraphs on questions, issues and PRs 2015-10-07 03:28:01 +00:00
Jérémie Astori
96d500c2a9 Add descriptions for 2 new labels: quick and easy, and security 2015-10-07 03:20:12 +00:00
Jérémie Astori
5aae711bc6 Add label explanation to the CONTRIBUTING file 2015-10-07 03:20:12 +00:00
Jérémie Astori
933750be69 Add a small introduction to the CONTRIBUTING file 2015-10-07 03:20:12 +00:00
Jérémie Astori
51cdf6dc88 Merge pull request #499 from floogulinc/local-fonts
Replace Google hosted fonts with local ones
2015-10-06 22:41:51 -04:00
Jérémie Astori
dcc03786a2 Switch to SVG version of npm badge in the README 2015-10-07 02:26:29 +00:00
Jérémie Astori
de20c3170d Merge pull request #508 from Calinou/master
Add a copy of the MIT license
2015-10-06 22:14:35 -04:00