libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
804 commits 2 branches 0 tags 24 MiB
Commit graph

192 commits

Author SHA1 Message Date
John McLear
f465ebaab9 Being mentioned in a chat 2011-11-27 16:35:20 +00:00
John McLear
9bfc78eac1 Applied 0ip's fix https://github.com/Pita/etherpad-lite/issues/233#issuecomment-2884908 2011-11-27 01:11:51 +00:00
John McLear
33c51e1b01 Second and final part of https://github.com/Pita/etherpad-lite/issues/233 2011-11-26 19:16:32 +00:00
Peter 'Pita' Martischka
7296913cb0 fixed merge confilicts 2011-11-25 16:56:08 -08:00
Peter 'Pita' Martischka
54b912f352 Revert "This should fix the IE Cursor Issue #171" 
This reverts commit 53bf7dc19d.
 2011-11-25 16:10:21 -08:00
Peter 'Pita' Martischka
dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-25 16:08:24 -08:00
Peter 'Pita' Martischka
fa098d73cd Do a reconnect on network problems. After 10s it gives up 2011-11-25 15:26:01 -08:00
Jean-Tiare Le Bigot
7d184a681a fix indenting while cursor is in the line 2011-11-26 00:02:25 +01:00
Jean-Tiare Le Bigot
caf8792974 applying/removing list now preserves the indentation level 2011-11-25 11:10:57 +01:00
Jean-Tiare Le Bigot
ea2e7d0550 added support for (de)indent of regular text 2011-11-25 10:29:31 +01:00
Jean-Tiare Le Bigot
6b11ae330d added handling of de-indenting when already on higher level 2011-11-25 09:13:03 +01:00
John McLear
40fcc83a05 Merge pull request #227 from jtlebi/origin/shift-tab 
handle shift+tab, trivial fix
 2011-11-24 08:04:04 -08:00
Alexandre Girard
7a7b3391fb add checkbox to limit number of inputs 2011-11-24 16:34:28 +01:00
Jean-Tiare Le Bigot
42341f2b2f handle shift+tab, trivial fix 2011-11-24 15:29:45 +01:00
John McLear
dedd604125 Add support for embedding read only etc. 2011-11-23 15:46:34 +00:00
John McLear
2db81050f1 Fixes "I did more testing and there are a few issues that comes up. If you type anything starting with www then that entire phrase becomes an anchor tag, even if there is a space after the www. So for example in the sentence "Put www at the start of the address" "www at" would become an anchor. The regex need updating to require a dot after the www, which I think would fix the issue, but my regex knowledge is not great." 2011-11-22 21:03:50 +00:00
John McLear
55a2f46ca9 https://github.com/Pita/etherpad-lite/issues/143 - needs to be included with earlier commit that should still be in master if pita didn't remove. This fixes the bug where a url without http:// wouldnt be detected as a url and then a subsequent bug I am the father of where it would detect it as a user, open a new page but fudge up the url and make the page fail to load. 2011-11-20 04:24:58 +00:00
John McLear
697201b3de Addresses https://github.com/Pita/etherpad-lite/issues/173 but needs a lot of testing and a word of warning, at current doing shift tab deletes the previous character as it emulates a backspace. 2011-11-20 03:52:19 +00:00
Peter 'Pita' Martischka
53bf7dc19d This should fix the IE Cursor Issue #171 2011-11-19 12:30:12 -08:00
Peter 'Pita' Martischka
7a7869a602 Revert "Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. " 
This reverts commit d5e303ec9f.
 2011-11-19 12:20:24 -08:00
John McLear
d5e303ec9f Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. 2011-11-19 19:19:33 +00:00
Lorenzo Gil Sanchez
fd056cf09c Adapt client code for its use in the server 2011-11-17 10:26:23 +01:00
andrehjr
8e7e74170e Extract getUrlVars() function calls to a local var 2011-11-15 21:36:26 -02:00
andrehjr
ce4d9df665 Fix issue #182: Pad forgets usernames 2011-11-15 21:33:43 -02:00
John McLear
1bfd0e4707 Allow authorship background colors to be disabled with a parameter 2011-09-04 13:48:53 +01:00
Jacob Chapel
a107f080a8 fix username being set in querystrings 2011-09-02 12:56:51 -07:00
Peter 'Pita' Martischka
7b8d48467f added proper embed parameter support, fixes #116 2011-08-23 18:36:38 +01:00
Peter 'Pita' Martischka
913c3c455d fixed merge conflicts 2011-08-22 13:14:59 +01:00
Peter 'Pita' Martischka
177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01:00
Peter 'Pita' Martischka
4e592def7e fixed color chooser 2011-08-21 19:27:02 +01:00
John McLear
c1272ed566 Fixed minor German effort at English ;) 2011-08-21 19:21:23 +01:00
Peter 'Pita' Martischka
307d0acdeb put expolorer canvas into minify 2011-08-21 19:20:18 +01:00
John McLear
1df9d04e04 Fix for farbtastic in IE9, I had to recreate the file because the original commit was so messy 2011-08-21 19:08:19 +01:00
Peter 'Pita' Martischka
0b18e46bc3 keep the userlist open while editing 2011-08-21 19:07:35 +01:00
Peter 'Pita' Martischka
4f233d88f8 fixed the backward compatility to old colorIds 2011-08-21 18:53:30 +01:00
Peter 'Pita' Martischka
070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01:00
Peter 'Pita' Martischka
42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka
9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +01:00
Peter 'Pita' Martischka
c7f3b3d9ec Merge branch 'patch-2' of https://github.com/0ip/etherpad-lite 2011-08-17 19:36:56 +01:00
Peter 'Pita' Martischka
c2457e06d8 send client side javascript errors to the server 2011-08-17 19:24:44 +01:00
Robin Buse
47a16ddbe2 QR code support (js) 2011-08-16 23:34:05 +03:00
Peter 'Pita' Martischka
d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
Peter 'Pita' Martischka
48980f9e19 Show permission messages on the browser side 2011-08-15 18:27:11 +01:00
Peter 'Pita' Martischka
255dc5a325 fixed merge conflicts 2011-08-15 16:58:22 +01:00
John McLear
7d1dbae5e5 Add pad.css and custom/pad.css availability into the iFrame as a fix for issue 83 2011-08-15 15:49:09 +01:00
Peter 'Pita' Martischka
37a220fa87 fixed opera bug thx @johnyma22 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
b300dc1d2c fixed merge conflicts 2011-08-13 22:18:42 +01:00
John McLear
db3ee19ced Added support for monospace font to be passed as a parameter in the URL 2011-08-13 22:10:58 +01:00
Peter 'Pita' Martischka
d0e378f63a added a security manager to control pad access on group pads 2011-08-13 22:07:21 +01:00
John McLear
4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +01:00
John McLear
bba9cd515b Added support for changing username from the URL ie ?userName=JohnMcLear -- doesnt urldecode etc. needs checking for vulnerabilities too 2011-08-13 19:53:02 +01:00
John McLear
7f28889660 Removed my cake commit that I used as a placemarker 2011-08-13 18:38:00 +01:00
John McLear
8db0c12bbe Add support for removing line numbers using the jQuery API and stopped it publishing that change back if the param is set 2011-08-13 18:37:44 +01:00
John McLear
fb593c1d5c Began adding support for passing parameters via the URL and removed a location redirect that was no longer needed 2011-08-12 16:00:09 +01:00
Peter 'Pita' Martischka
0e05e58c76 changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd) 2011-08-11 15:27:16 +01:00
Peter 'Pita' Martischka
13c10013b9 do the chat resize without hiding the pad text 2011-08-10 18:18:50 +01:00
Peter 'Pita' Martischka
d812557445 fixed #73 2011-08-10 18:06:22 +01:00
Peter 'Pita' Martischka
053e48c3f4 Secure the call of the costumStart function 
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
 2011-08-01 12:09:33 +01:00
Peter 'Pita' Martischka
de32503f8e improve including of custom js/css 2011-07-31 17:21:01 +01:00
Peter 'Pita' Martischka
bcaadfa6eb Ensure the browser doesn't send socket.io message with the browser version 2011-07-31 16:13:56 +01:00
Peter 'Pita' Martischka
aa5b1b85ae fixed all random string functions 2011-07-31 11:48:06 +01:00
Peter 'Pita' Martischka
115f7d6b51 Fixed the iframe problems 2011-07-27 15:11:30 +01:00
Peter 'Pita' Martischka
e96595896c Fixed wordle export under https 2011-07-27 13:35:22 +01:00
Peter 'Pita' Martischka
6867d881b1 Hide import/export options that are not avaiable if abiword isn't configured 2011-07-26 18:54:42 +01:00
Peter 'Pita' Martischka
b43c7e7c99 ensure non url chars are not used for pad names or pad links 2011-07-26 16:17:02 +01:00
Peter 'Pita' Martischka
eb40c014b6 Fixed the NaN Bug on timeslider 2011-07-25 17:26:56 +01:00
Peter 'Pita' Martischka
e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01:00
Peter 'Pita' Martischka
3ccdcec7e8 ensure we don't send a handshake on every reconnect 2011-07-22 14:17:58 +01:00
Peter 'Pita' Martischka
a717e07531 Moved John's code to the correct place 2011-07-22 14:07:13 +01:00
Peter 'Pita' Martischka
b13fbbfd73 Import works now on the server side 2011-07-21 20:13:58 +01:00
John McLear
4b268f9579 Make a pulsating chat notification and remove the throb from the tab 2011-07-20 21:50:58 +01:00
John McLear
2920c35c0f Now import/Export works 2011-07-20 17:33:27 +01:00
John McLear
43508a32a3 Ensure the last chat comment is always in focus after resize 2011-07-20 17:23:01 +01:00
John McLear
4f06d4688f Add wordle support, temporary, Pita to move 2011-07-20 16:38:03 +01:00
John McLear
802866a5da Open link in new window file 2011-07-20 16:01:26 +01:00
John McLear
77dc7ede14 change end points to right export endpoint 2011-07-20 15:48:24 +01:00
John McLear
50c6b9de00 Temporary code that brings in some export support 2011-07-20 15:42:47 +01:00
John McLear
a07bd76625 Final major add for working buttons in IE 2011-07-19 20:04:36 +01:00
John McLear
e7b690c7fc Make the chat work in IE 2011-07-19 20:04:24 +01:00
John McLear
9f966e0035 Make CSS more comprehendable by mear mortals. 2011-07-19 20:03:40 +01:00
John McLear
f245685c3a Remove a line break.. heh 2011-07-19 20:03:01 +01:00
John McLear
65baa26fca Resize chat 2011-07-19 20:02:48 +01:00
John McLear
0643bb888f Remove old jquery ui file 2011-07-19 20:02:35 +01:00
John McLear
f7ce124ce2 Add a new version of jquery ui with support for resizable 2011-07-19 20:02:29 +01:00
John McLear
2dd2a4a055 Added support to resize chat 2011-07-19 20:02:03 +01:00
John McLear
ab7b043fd1 Dont show IP addy or browser info when hovering# 2011-07-19 20:01:36 +01:00
Peter 'Pita' Martischka
f871602754 remove the 32000 px lock, thx to @smesher 2011-07-14 18:38:29 +01:00
Peter 'Pita' Martischka
29878e648e added a Chat 2011-07-14 16:15:38 +01:00
Peter 'Pita' Martischka
1c1e035bf1 Show a read only link on the pad 2011-07-08 17:42:07 +01:00
Peter 'Pita' Martischka
7915390b83 select the embed code when it drops down 2011-07-08 15:37:57 +01:00
Peter 'Pita' Martischka
cbbb0a4ed1 cleaned the dropdown code a lot 2011-07-08 15:19:38 +01:00
Peter 'Pita' Martischka
271ee1776b beautified all static js files 2011-07-07 18:59:34 +01:00
Peter 'Pita' Martischka
ac1858f8ec Fixes a problem with the resource path of socket.io 2011-07-06 19:51:41 +02:00
Peter 'Pita' Martischka
9db609ecc1 beautify the colorpicker 2011-07-06 14:08:20 +01:00
Peter 'Pita' Martischka
b46c0e3b3c Let the embed code and the userbar slide down with an animation 2011-07-06 13:42:00 +01:00
Peter 'Pita' Martischka
973d73ebee ensure all paths are relative 2011-07-05 20:16:45 +02:00
Peter 'Pita' Martischka
af57413cfa Ops, forgot the static files 2011-06-23 14:09:41 +01:00
Peter 'Pita' Martischka
fd5aafe17a update to socket.io 0.7.2 2011-06-23 12:33:31 +01:00
Peter 'Pita' Martischka
add35f16fd clean the code 2011-06-20 15:59:27 +01:00
Peter 'Pita' Martischka
867525945d Timeslider is working 2011-06-20 15:37:41 +01:00