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

7442 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lorenzo Gil Sanchez
943f8c4682 Stupid syntax error due to last minute refactoring 2011-11-22 16:09:27 +01:00
Lorenzo Gil Sanchez
e6de06b103 Transform multiline HTML into a single line stream to avoid spurious lines in the final result 2011-11-22 10:09:10 +01:00
Jordan
6297e628eb Permissions checks on pad and timeslider in server.js are redudant 2011-11-21 15:51:54 -05:00
Jordan
5e7c5d5dd3 Add editOnly option 2011-11-21 12:44:33 -05:00
Jordan
5630889fb0 A more precise description of the requireSession setting 2011-11-21 11:54:29 -05:00
John McLear
49e28ddc05 Merge pull request #220 from alx/apikey-trim 
fix issue with newline in APIKEY.txt when checking api key
 2011-11-21 07:57:17 -08:00
Alexandre Girard
90e9d552f0 fix issue with newline in APIKEY.txt when checking api key 2011-11-21 16:39:54 +01:00
Jordan
9850ba43ee Implement a 'requireSession' mode, which requires any user to have a valid session 2011-11-21 01:45:37 -05: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
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
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
Lorenzo Gil Sanchez
a26918c69e Hook the ImportHtml module into the API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez
9fe6c11d87 Main implementation of the setHTML API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez
09cb367d8e The contentcollector code is harder to adapt since it has the Changeset module as a dependency 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez
fd056cf09c Adapt client code for its use in the server 2011-11-17 10:26:23 +01:00
Lorenzo Gil Sanchez
4e5e5edc8e Add jsdom as a dependency to be able to parse HTML in the server 2011-11-16 17:39:33 +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
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
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
jaseg
b0976a292f Fixed a somewhat quirky random string generator, made another windows-only delay actually windows-only. 2011-11-10 11:39:46 +01:00
John McLear
6a75c45968 Merge pull request #197 from jaseg/master 
Stuff I came across while reading the code: Spelling fixes and two small code patches.
 2011-11-09 08:38:25 -08:00