mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
645 commits 219 branches 107 tags 76 MiB
Commit graph

645 commits

This branch
This branch
All branches
Author SHA1 Message Date
GitHub Merge Button
423724716b Merge a671140378 into 55a2f46ca9 2011-11-19 20:25:01 -08: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
2e79bd50a3 fixed socket.io logging 2011-11-19 14:14:31 -08: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
Peter 'Pita' Martischka
a6b4260cc9 Updated JQuery to 1.7, thx to @wikinaut 2011-11-19 12:18:21 -08:00
Peter 'Pita' Martischka
2f16dff0ba Merge branch 'master' of https://github.com/jhollinger/etherpad-lite 2011-11-19 12:08:57 -08:00
Peter 'Pita' Martischka
54c8e46cdf Fixed Joes typo commit 2011-11-19 12:07:39 -08:00
Peter 'Pita' Martischka
0123fa0838 Merge branch 'master' of https://github.com/holtzermann17/etherpad-lite 2011-11-19 11:58:33 -08:00
Peter 'Pita' Martischka
e12049ef5b Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-19 11:27:02 -08:00
Joe Corneli
0aa56136fe Fix message typos 2011-11-19 19:21:23 +00: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
Wikinaut
a671140378 changing layout of page titles. padname, then '| Etherpad' string in the document.title 2011-11-19 10:40:57 +01:00
Jordan
411984787a Implement POST requests for HTTP API 2011-11-18 21:52:12 -05:00
Peter 'Pita' Martischka
673d2c028b Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-18 13:56:30 -08:00
Peter 'Pita' Martischka
38742d12b9 Improved the README 2011-11-18 13:56:26 -08:00
Wikinaut
0fc72bc7e7 auto-open on chat icon; auto-focus on chat input; fix for https://github.com/Pita/etherpad-lite/issues/208 2011-11-18 07:43:51 +01:00
Peter 'Pita' Martischka
a9540cb8b7 Merge pull request #209 from soul9/master 
Document database usage on production servers
 2011-11-17 19:27:40 -08:00
John Soros
7362992191 Update README.md and settings.json.template: use mysql or sqlite for production 2011-11-18 03:49:00 +01:00
Wikinaut
66a9798615 Merge commit '419d2bb' into monospace 2011-11-17 20:39:04 +01:00
Wikinaut
0d760f0dbb replace underscores back to spaces in page titles 2011-11-16 23:31:20 +01:00
Wikinaut
913c006152 my changes in pad2.js 2011-11-16 23:22:55 +01:00
Wikinaut
0a795724c8 my changes in pad2.js 2011-11-16 23:20: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
Peter 'Pita' Martischka
6d190f517e Merge pull request #184 from thomasf/issue158 
Kind of a hack but fixes issue #158
 2011-11-14 21:35:37 -08:00
Wikinaut
dc2aafa062 changing spaces or slashes in padnames to underscores 2011-11-14 20:32:27 +01:00
Wikinaut
5ea8dd6b70 correcting the uri decoding, so that also non-ASCII characters are correctly shown in hml page titles 2011-11-14 09:00:18 +01:00
Wikinaut
4e104e8c83 changing index.html to prompt user to allow to change the random padname, for example to add a reasonable prefix 2011-11-14 08:51:37 +01:00
Wikinaut
916e900cf3 Merge remote branch 'upstream/master' 2011-11-14 08:32:46 +01:00
Peter 'Pita' Martischka
a6f7a63478 removed unneeded old parts from buildForWindows 2011-11-13 21:18:23 -08:00
Peter 'Pita' Martischka
646d6a4875 updated node.js version for buildForWindows Script to 0.6.1 2011-11-13 21:03:05 -08:00
Peter 'Pita' Martischka
9eac04aaa6 Fixed a huge problem with the sessioninfos array 2011-11-13 20:33:13 -08:00
Peter 'Pita' Martischka
a5a9592031 Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message" 
This reverts commit 0f559347ee.
 2011-11-13 20:25:22 -08:00
Wikinaut
b3c75a619d index.html title -lite 2011-11-14 00:29:51 +01:00
Wikinaut
bfafed3ef2 index.html 2011-11-14 00:26:46 +01:00
Wikinaut
e1052a6a5d my version plus recent 2011-11-13 22:36:01 +01:00
John McLear
dac828e8f6 Update static/index.html 2011-11-13 14:32:21 +00:00
Peter 'Pita' Martischka
5f12744446 update ueberDB 2011-11-12 17:32:30 -08:00
Peter 'Pita' Martischka
820326dc2b Output more informations on message dropped 2011-11-12 16:47:01 -08:00
Peter 'Pita' Martischka
08fbc3c3bc Updated all dependencies 2011-11-12 16:46:26 -08:00
Peter 'Pita' Martischka
08e0c91204 removed the node v0.4 check, it works now with node v0.6 2011-11-12 16:46:10 -08:00
Peter 'Pita' Martischka
17666339d0 Merge pull request #191 from Yaco-Sistemas/master 
Get the HTML of a Pad via the API
 2011-11-12 15:04:53 -08:00
John McLear
eecb45cbfd Focus on input box onLoad 2011-11-12 18:30:38 +00:00
Wikinaut
74fdfec1c2 removing my favicon from master 2011-11-10 22:48:20 +01:00
Wikinaut
223016d78d Revert "patch to allow user-added prefixes and modification to random pad names; correctly process uri-encoded utf-8 characters in pad names and page titles" 
This reverts commit bda20a38a4.
 2011-11-10 22:42:30 +01:00
Wikinaut
bda20a38a4 patch to allow user-added prefixes and modification to random pad names; correctly process uri-encoded utf-8 characters in pad names and page titles 2011-11-10 22:42:02 +01:00
Wikinaut
5bef51f468 Merge remote branch 'upstream/master' 2011-11-10 00:21:37 +01:00