John McLear
|
babb33d825
|
add authorId to chat and userlist, possibly privacy/security issue?
|
2013-03-13 21:55:29 +01:00 |
|
John McLear
|
5b285e2ffa
|
Merge pull request #1430 from mluto/notification-on-startup
Don't show notifications when loading the chat-messages.
|
2013-01-30 06:33:47 -08:00 |
|
mluto
|
b5eeeb7dc2
|
Don't show notifications when loading the chat-messages.
|
2013-01-30 12:16:32 +01:00 |
|
John McLear
|
daaa650a1b
|
remove message about requiring comments
|
2013-01-29 12:15:11 +00:00 |
|
John McLear
|
a7361f5ce0
|
make tinycon update on all chat messages not just ones that mention your name
|
2013-01-29 12:09:16 +00:00 |
|
John McLear
|
1c7810783c
|
gritter now implemented
|
2013-01-29 01:55:36 +00:00 |
|
mluto
|
e31b9fd1bd
|
IE8 does not have a string.trim()-function, so use regex..
|
2013-01-16 18:48:25 +01:00 |
|
John McLear
|
bb9097e528
|
Merge pull request #1355 from mluto/chat-no-empty-line
prevent empty chat-messages from being sent
|
2013-01-14 14:25:46 -08:00 |
|
mluto
|
77401f2759
|
prevent empty chat-messages from being sent
|
2013-01-14 17:11:56 +01:00 |
|
mluto
|
bc05f9eb0a
|
converted load-more-link to button, added loading-gif, fixed typo
|
2013-01-07 19:15:55 +01:00 |
|
mluto
|
825b258d99
|
only load 20 messages when pressing the load-link, fixed whitespace
|
2013-01-07 17:43:03 +01:00 |
|
mluto
|
5f81daed0a
|
Added link to load more chat-messages using new GET_CHAT_MESSAGES
|
2013-01-07 17:36:03 +01:00 |
|
mluto
|
5592c4b0fe
|
client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages
|
2013-01-06 16:11:48 +01:00 |
|
Iván Eixarch
|
9f1872afc1
|
use properties notation
|
2012-12-09 08:56:58 +01:00 |
|
Iván Eixarch
|
b01903202c
|
Added new strings to translate for js files
|
2012-12-07 05:24:40 +01:00 |
|
John McLear
|
b4680e42d7
|
add a keystroke check for chat and make it so the chat listens on event 13 aswell as event 10
|
2012-10-28 17:38:56 +00:00 |
|
Chad Weider
|
03bcd07741
|
Use packaged version of Tinycon.
|
2012-09-09 18:18:59 -07:00 |
|
Marcel Klehr
|
dc9eda9364
|
Use Tinycon to display chat mentions in favicon.
|
2012-07-12 20:18:33 +02:00 |
|
Marcel Klehr
|
f12cb0dd58
|
Don't screw up, if chat is empty.
|
2012-07-12 10:34:11 +02:00 |
|
Marcel Klehr
|
8a471e590a
|
Fix #581 Don't scroll chat automatically if user is not at the bottom
|
2012-07-11 22:30:03 +02:00 |
|
John McLear
|
6726ea6632
|
option to stop autoscroll
|
2012-07-11 17:42:59 +01:00 |
|
John McLear
|
0483802841
|
resolve issue #384 and also clear chat counter whenever focus is on chat input. Just a slightly nicer chat experience
|
2012-06-12 22:52:22 +02:00 |
|
Matthias Bartelmeß
|
f34f0585bb
|
smashing errors caused by .forEach
|
2012-03-14 01:28:08 +01:00 |
|
Chad Weider
|
ddda347f7a
|
Merge branch 'require-paths' into plugin
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
|
2012-03-10 15:08:09 -08:00 |
|
Egil Moeller
|
ce5d2d8685
|
Merge branch 'pita'
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
|
2012-03-02 22:00:20 +01:00 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|