fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
670 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

325 Commits

Author SHA1 Message Date
Peter 'Pita' Martischka e5d12f1d56 cherry picking @Yaco-Sistemas commit to fix IE 8 2011-11-28 11:18:47 -08:00
Peter 'Pita' Martischka a2d3c6ddb2 Merge branch 'master' of git://github.com/Pita/etherpad-lite 2011-11-28 11:16:33 -08:00
John McLear 054af3da77 Change embe this pad to share and embed this pad 2011-11-28 02:42:30 +00:00
John McLear 90d36471b1 Remove read only link and place all functionality into embed option sorts issue #246 2011-11-27 21:04:11 +00:00
John McLear 19ee4865f4 Make the title changes Pita wanted which were show an increment and also fix the bug where it would keep increasing the title this is part of issue #125 2011-11-27 20:39:47 +00:00
Kai Hermann 5838e7ee7f fixed merge conflicts 2011-11-27 11:55:18 -08:00
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
John McLear dd2d0d45f0 First part of https://github.com/Pita/etherpad-lite/issues/233 2011-11-26 19:15:43 +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
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 ccaa21a04a Styling for the new embed options 2011-11-23 15:49:22 +00: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
Peter 'Pita' Martischka fa9b36df0f Merge pull request #203 from andrehjr/issue187 
Fix issue # 187 Pad forgets usernames often
 2011-11-15 23:11:55 -08: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 dac828e8f6 Update static/index.html 2011-11-13 14:32:21 +00:00
John McLear eecb45cbfd Focus on input box onLoad 2011-11-12 18:30:38 +00:00
John McLear bf0fe9377d Input fix for Wikinaut 2011-11-06 12:06:16 +00: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
Robin Buse 335643a860 ODT Import works but wasn't mentioned yet 2011-08-24 05:22:46 +03:00
Robin Buse fd97946619 fixed user drop down issue 2011-08-24 04:48:21 +03:00
Peter 'Pita' Martischka 913c3c455d fixed merge conflicts 2011-08-22 13:14:59 +01:00
Peter 'Pita' Martischka e771542961 added deleteGroup API function 2011-08-22 13:11:34 +01:00
Peter 'Pita' Martischka a231ff45e1 fixed fileupload field in Firefox 2011-08-21 20:17:38 +01:00
Peter 'Pita' Martischka 177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01:00
Peter 'Pita' Martischka 8c301d4fe8 remove star buttons on timeslider 2011-08-21 20:09:09 +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 6c354c6333 improved the design of the user icon 2011-08-21 18:18:35 +01:00
Peter 'Pita' Martischka 070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01:00