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

553 commits

Author SHA1 Message Date
Chad Weider
c4fa2ecddb Don't prefix libraries that are prefixed by '$'. #hack 2012-09-09 18:18:58 -07:00
Chad Weider
3b40850195 Add index paths in tar processing. 2012-09-09 18:18:58 -07:00
Chad Weider
a5653c7192 Clean up tar file processing. 2012-09-09 18:18:58 -07:00
Chad Weider
b8faf1f78b Serve libraries from node_modules. 2012-09-09 18:18:58 -07:00
Chad Weider
766c301a44 Only files should be treated as being existant. 2012-09-09 18:13:37 -07:00
John McLear
32b4729305 Merge pull request #987 from cweider/loopback-avoidance 
Windows server fixes
 2012-09-09 15:50:42 -07:00
Chad Weider
a97b83babc Another workaround for Windows paths. 2012-09-09 14:42:32 -07:00
Chad Weider
3b5ea88bf5 If the file was not found this should be nothing. 2012-09-09 14:42:32 -07:00
Chad Weider
3312387b08 Drop embedding of modules. 
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
 2012-09-09 14:40:20 -07:00
Marcel Klehr
ea0f7cb2e9 Add support for multiple api versions 2012-09-09 18:20:16 +02:00
Gedion
c37c48cd12 added hooks and made some functions available to editor info object in ace 2012-09-08 13:45:33 -05:00
Gedion
6d1cba2259 added hooks to contentcollector.js 2012-09-08 12:11:04 -05:00
Gedion
a2c8d21240 added hooks to contentcollector.js 2012-09-08 12:03:13 -05:00
John McLear
453b6473a0 Merge pull request #984 from lepidum/develop 
Fixed ESC key handling issue of Firefox 15
 2012-09-07 06:23:57 -07:00
John McLear
3cbd59c769 Update src/node/db/AuthorManager.js 2012-09-04 22:47:56 +02:00
John McLear
7e79bf3462 Update src/node/handler/APIHandler.js 2012-09-04 17:26:08 +02:00
John McLear
21dcce2296 Update src/node/db/AuthorManager.js 2012-09-04 17:25:19 +02:00
John McLear
40a7b43799 Update src/node/db/API.js 2012-09-04 17:23:33 +02:00
John McLear
c5be2eb418 Merge pull request #977 from cweider/loopback-avoidance 
Loopback avoidance
 2012-09-03 14:56:55 -07:00
Chad Weider
6e796eb5fb Make exception case for require kernel obvious. 2012-09-03 14:41:26 -07:00
Chad Weider
02c22d7b89 Remove loopback from Minify. 2012-09-03 14:38:28 -07:00
Chad Weider
024a26f272 Minify publishes its own mock request thing. 2012-09-03 14:37:26 -07:00
Chad Weider
4413d498d8 Minify is a named function. 2012-09-03 14:35:36 -07:00
John McLear
de7934d9fb Merge pull request #958 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues 
Fix ie8 native xmlhttp support disabled issues
 2012-09-03 06:35:52 -07:00
Marcel Klehr
dad83d9b77 Document multi-session cookie feature 2012-09-02 19:51:40 +02:00
NAGOYA, Yoshihiko
55cf1cabb5 fix prevent ESC key patch 2012-08-30 13:24:35 +09:00
NAGOYA, Yoshihiko
521e76ae44 prevent ESC key 2012-08-30 12:00:27 +09:00
Wikinaut
67088e5b7f upd version resolve 2012-08-18 01:03:18 +02:00
Wikinaut
e82588c332 use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues 2012-08-18 00:47:13 +02:00
Mark Holmquist
f9469ef256 Add in padUsers HTTP API call 
I needed the list of users this time, so I got it. There are docs
and everything.
 2012-08-17 13:39:16 -07:00
Wikinaut
da30c8983a fix issue #955: upd resolve library to 0.2.3 2012-08-17 00:45:02 +02:00
Wikinaut
85f5eb38e4 fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled 2012-08-16 01:00:36 +02:00
Daniel Perez Alvarez
699aa299f8 Normalize inserted text using UNorm 
For some reason, the client was sending the server a Unicode-normalized
version of inserted strings. So if for example we inserted the string
'ä' (i.e. \x61\xCC\x88) into the document, what would be sent to the
server would be 'ä' (i.e. \xC3\xA4).

This wouldn't be a problem on its own. BUT JavaScript reports that the
length of the first string is 2, while the length of the second one is
1.

So the command that was being sent to the server was 'Z:1>2*0+1$ä', when
it should really be 'Z:1>1*0+1$ä'. When the `checkRep` method checks the
length of the inserted string, it finds an inconsistency, and
disconnects the client.

We now normalize the inserted string before the command is generated, so
the length is always correct.
 2012-08-13 17:09:02 +01:00
Daniel Perez Alvarez
48f1545777 Add Unicode normalization library 2012-08-13 17:06:25 +01:00
John McLear
71d6d520e8 Merge pull request #939 from marcelklehr/fix/group2sessions-bug 
Create group2sessions.sessionIDs if it doesn't exist yet.
 2012-08-12 09:10:29 -07:00
John McLear
a5f6815e65 Merge pull request #899 from marcelklehr/fix/show-onload-errors 
Display errors occuring on page load to the user.
 2012-08-12 08:55:24 -07:00
John McLear
14c874b80e Merge pull request #903 from marcelklehr/feature/hook-loadSettings2 
[API hook] loadSettings
 2012-08-12 08:54:31 -07:00
John McLear
85191ca798 Merge pull request #905 from marcelklehr/feature/hook-documentReady 
Add a documentReady client hook
 2012-08-12 08:54:03 -07:00
John McLear
132278a9d6 Merge pull request #928 from marcelklehr/fix/update-socket-io 
Update socket.io
 2012-08-12 08:53:18 -07:00
John McLear
ba6acd822e Merge pull request #929 from MarkTraceur/hook/http/send-clients-message 
Add in an HTTP API call to send a custom message type.
 2012-08-12 08:53:07 -07:00
John McLear
1eb63535ca Merge pull request #931 from MarkTraceur/hook/plugin/handleClientMessage 
Add in a plugin hook "handleClientMessage_<MSG_NAME>"
 2012-08-12 08:52:53 -07:00
John McLear
a42b2440ba Merge pull request #943 from gedion/develop 
Add a hook for utils/ExportHtml.js
 2012-08-12 08:48:10 -07:00
Gedion
e9b22e8ac3 fix indentation 2012-08-11 15:44:42 -05:00
gedion
4d11e49878 Update src/node/utils/ExportHtml.js 
Added a hook for utils/ExportHtml.js
 2012-08-11 13:08:28 -05:00
Gedion
df7d7769c8 Added a hook for util/ExportHtml.js 2012-08-11 13:02:01 -05:00
Mark Holmquist
44878bc0a3 Add in a plugin hook "handleClientMessage_<MSG_NAME>" 
The new hook will accept only the message named in the hook call.
It will be used primarily for adding new message handlers, but it
can alse be used to handle existing message types.
 2012-08-10 09:51:18 -07:00
Marcel Klehr
d9d28369b2 Create author2sessions.sessionIDs if it doesn't exist yet. 2012-08-10 16:20:07 +02:00
Marcel Klehr
d6a0cfc398 Create group2sessions.sessionIDs if it doesn't exist yet. 2012-08-09 11:15:26 +02:00
Mark Holmquist
3d4fb81796 Add in an HTTP API call to send a custom message type. 
You cannot currently send any data with your custom message, but
this patch is just begging for a second one that will allow that.
 2012-08-08 10:12:11 -07:00
Marcel Klehr
cb0066f7b4 Update socket.io 2012-08-07 19:40:45 +02:00
Marcel Klehr
aa986ab954 Merge branch 'fix/editorloadingbox' into develop 2012-08-02 09:00:04 +02:00
Marcel Klehr
2fd604973c Remove the second occurrence of #editorloadingbox 2012-08-02 01:04:52 +02:00
Marcel Klehr
db54ab4b36 Merge pull request #887 from psifertex/develop 
adding basic numbered list support to dokuwiki export
 2012-08-01 12:36:04 -07:00
0ip
c9bdd1196d Merge pull request #872 from marcelklehr/feature/connectivity-toolbar 
Nice popups instead of modals
 2012-08-01 11:37:15 -07:00
Wikinaut
11e601fbcd fix #890 test if console is available before writing to console.log 2012-08-01 14:34:03 +02:00
Marcel Klehr
58d5203110 Add a documentReady client_hook. 2012-07-26 12:24:59 +02:00
odony
a2bf577393 Fix #769 - wonky bug with pasted lists 
After 6507614e459dac868d3c76355ca013d13132bc79 the contentcollector does not properly "exit" lists back to the `none` listType anymore.
The repro steps on #769 seem to pass correctly after this change.
 2012-07-25 13:45:53 +02:00
Marcel Klehr
de907cd0db Add loadSettings hook. 2012-07-25 10:58:30 +02:00
Marcel Klehr
6f91facf49 Retain original onerror handler. 2012-07-23 15:03:20 +02:00
Marcel Klehr
c3dcb08a2c Remove console.log 2012-07-23 14:33:30 +02:00
Marcel Klehr
fa3020dffd Display errors occuring on page load to the user. 2012-07-23 14:12:36 +02:00
Marcel Klehr
9d25dcc1f9 Merge branch 'develop' into feature/connectivity-toolbar 
Conflicts:
	src/templates/pad.html
 2012-07-23 11:26:15 +02:00
Chad Weider
cd11717b99 Eliminate the loopback that has been causing so much trouble. 
`localhost`, `0.0.0.0`, `127.0.0.1` each works only in some places some of the time, this works around the problem by overriding Yajsml's built-in request mechanism in favor of a hacked together one. TODO: Serve files from another service, or directly from the file system in order to make this unnecessary.

Fixes #747
 2012-07-22 23:55:07 -07:00
Uli Köhler
14582d1eba Escaped title using Security.escapeHTML() 2012-07-22 19:07:14 +02:00
Uli Köhler
8630de66bf Added missing newline after closing title tag 2012-07-22 18:37:38 +02:00
Uli Köhler
90357e0cdc Added <title> tag to make exported HTML valid 2012-07-21 21:19:44 +02:00
Marcel Klehr
c3ddff3fa0 Notify the user, if JavaScript is disabled. 2012-07-19 11:34:14 +02:00
Jordan Wiens
c0daf1aaaf adding basic numbered list support to dokuwiki export 2012-07-19 00:59:15 -04:00
Marcel Klehr
9aed433ad5 Fix #880 Remove call to padsavedrevs.handleIsFullyConnected 2012-07-18 15:54:53 +02:00
Matthias Bartelmeß
6b429b2ca1 Merge pull request #851 from marcelklehr/fix-settings.json 
Fix settings.json
 2012-07-17 10:27:18 -07:00
Mark Holmquist
9bd23acb3d Add userJoinOrUpdate hook 
This hook fires on the client side, whenever a user joins or
updates (hence the name). It will pass one thing, the user's info,
into the context. This is mostly just for notification purposes.
 2012-07-17 10:12:10 -07:00
Marcel Klehr
eb6be84150 Fix html/css 2012-07-15 16:03:12 +02:00
0ip
b1123d11b6 Correct path 2012-07-14 20:35:26 +03:00
Marcel Klehr
4901adeac7 Fix timeslider. 2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4 Fix some minor mistakes. 2012-07-14 15:54:20 +02:00
Marcel Klehr
2d0cf156af Fix showModal animation. 
New content shouldn' slide in before the containing popup.
 2012-07-14 15:14:46 +02:00
Marcel Klehr
4220d6bedd Put loading git back in. 2012-07-14 15:12:21 +02:00
Marcel Klehr
9a3cb2c727 Sort the toolbar buttons correctly. 2012-07-14 14:54:25 +02:00
Marcel Klehr
444467bef2 Remove connectivity tollbar button. 2012-07-14 14:50:52 +02:00
Marcel Klehr
8ab12ee69e Only disable toolbar. 
Make content available and allow scrolling
 2012-07-14 14:46:02 +02:00
Marcel Klehr
6bda1f8e4d Fix padeditbar.toggleDropDown 
Only call callback, if one was passed.
 2012-07-13 09:13:22 +02:00
Marcel Klehr
9e9cbd5ffa Fix typo. 2012-07-13 08:24:02 +02:00
Marcel Klehr
6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. 2012-07-13 08:23:22 +02:00
Marcel Klehr
dc9eda9364 Use Tinycon to display chat mentions in favicon. 2012-07-12 20:18:33 +02:00
Marcel Klehr
ead379cf66 Merge pull request #853 from fourplusone/feature/async_handleMessage 
async handle message
 2012-07-12 03:50:37 -07:00
Marcel Klehr
f12cb0dd58 Don't screw up, if chat is empty. 2012-07-12 10:34:11 +02:00
Marcel Klehr
7653db36fe Revert "option to stop autoscroll" 
This reverts commit 6726ea6632.

Conflicts:

	src/static/js/chat.js
 2012-07-12 10:23:55 +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
Marcel Klehr
dc09323d8f Don't exit if no settings file was found. 2012-07-11 15:36:41 +02:00
Marcel Klehr
f09dd0f3fb Put toString() back in. 2012-07-11 15:34:33 +02:00
Marcel Klehr
beb6378656 Merge pull request #850 from fourplusone/feature/remove_opt 
CodeCleanup: remove unused _opt in favor of code size/readability
 2012-07-10 13:03:44 -07:00
Marcel Klehr
87f26334d1 Fix typo. 2012-07-10 21:55:35 +02:00
Marcel Klehr
8858446678 Exit on error. 2012-07-10 21:38:14 +02:00
Jordan Hollinger
a7dd620b9f Don't crash if setText isn't passed any text. issue #861 2012-07-10 00:53:55 -04:00
Matthias Bartelmeß
975171a86b Make handleMessage async 2012-07-08 21:06:19 +02:00
Marcel Klehr
4c8f69b7c5 Use v8 to parse settings.json 2012-07-08 18:59:46 +02:00
Matthias Bartelmeß
3a0015c357 remove unused _opt in favor of code size/readability 2012-07-08 11:51:04 +02:00
Marcel Klehr
af3c57a120 Load npm to enable server to see the git revision. 2012-07-08 11:37:24 +02:00
Matthias Bartelmeß
9ff3aa0ee0 make /static/tests.html functional again, 
added getLastEdited
 2012-07-07 20:41:26 +02:00
Jordan Hollinger
6d5fe459f0 Bugfix to getLastEdited API method, issue #845 2012-07-07 13:22:27 -04:00
John McLear
34fdfcb253 Merge pull request #840 from redhog/master 
Bugfix for readonly timeslider
 2012-07-05 10:34:55 -07:00
Egil Moeller
17b6103a3d Bugfix for broken readonly timeslider 2012-07-05 19:33:20 +02:00
John McLear
bc15ea5c15 Merge pull request #829 from marcelklehr/support-node-0.8 
Support node 0.8
 2012-07-05 09:54:25 -07:00
Egil Moeller
799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list 2012-07-05 18:13:29 +02:00
Marcel Klehr
42bbbd426f Add latest versions of async, express and connect. 2012-07-05 18:11:18 +02:00
Marcel Klehr
c01aaeefc1 Allow node v0.6.x and 0.8.x 2012-07-05 17:34:23 +02:00
Egil Moeller
a0548af021 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver 2012-07-03 23:32:37 +02:00
Egil Moeller
b438a278a1 Make the server restart on plugin install 2012-07-03 23:31:44 +02:00
Mark Holmquist
91ed1f57c5 Don't rewrite in a stupid way 
Since we're already in the proper path for the pad, why worry
about it? Replacing the entire path of the URL with /p/padname may
have seemed like a good idea at the time, but really, for a 302 we
only need a relative pathname. This patch provides the proper way.
 2012-07-02 16:46:31 -07:00
Marcel Klehr
9d35b51500 Replace path.exists with fs.exists 2012-06-30 18:57:59 +02:00
Mark Holmquist
a71a8a7efc Add in padUsersCount method and API call 
The PadMessageHandler objects now have a new API call associated
with them. I'm sure that's a funny place to put it, but the
pad2sessions object in that file seems to be the only place user
counts are stored!

Anyway, I hope this is helpful. I know it would be for me :)
 2012-06-29 11:26:12 -07:00
Marcel Klehr
227477967f Fix plugin loader 
make it work on client side and with relative paths
 2012-06-29 12:40:16 +02:00
Marcel Klehr
b0d369883b Fix plugin loader to work with windows paths (e.g. 'D:\foo\...') 2012-06-28 15:58:28 +02:00
John McLear
711dee8f6b Merge pull request #821 from marcelklehr/fix-contributor-api-methods 
Fix contributor api methods
 2012-06-27 12:12:41 -07:00
Marcel Klehr
93b50d4a29 Some fixes to the contributor API methods 
Mostly these are coding style adjustments
 2012-06-27 21:02:41 +02:00
John McLear
a717c11ab3 Merge pull request #819 from marcelklehr/contributor-api-methods 
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
 2012-06-27 11:31:25 -07:00
Mark Holmquist
ab0d3c87cb Add in getLastEdited API call 
This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
 2012-06-27 10:05:17 -07:00
Marcel Klehr
6f9d7a5db7 Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad 
Return all pads that a given author has contributed to (not just
created) and return all authors who has contributed to a given pad.
 2012-06-27 18:23:17 +02:00
John McLear
0bc01feb72 Merge pull request #818 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:09:14 -07:00
Mark Holmquist
c4e660b206 Fix glaring problem with pull request 
I accidentally forgot to call finalHandler if there was no padID
.... :)
 2012-06-26 16:07:08 -07:00
John McLear
3d9a2360be Merge pull request #817 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:01:40 -07:00
Mark Holmquist
79ca5f3e7c Refuse connection if the user is no longer authorized 
This should do the trick for issue 815. Please review and merge if
it works.

Try again: Fewer variables.
 2012-06-26 16:00:38 -07:00
Mark Holmquist
854e1092d9 Add in a new hook for handleMessage 
Add a new hook: handleMessage. Whenever a message comes in, it is
intercepted by this hook.
 2012-06-26 14:10:42 -07:00
John McLear
e4ff4021ab Merge pull request #810 from redhog/aceEditEvent 
Plugin/hook features&bugfixes
 2012-06-22 03:53:50 -07:00
Egil Moeller
476cfc8da0 Merge branch 'master' into aceEditEvent 2012-06-22 12:12:15 +02:00
Jordan Hollinger
6f37c0aaa6 The pad name sanitizer shouldn't drop query params. issue #779 2012-06-13 15:20:29 -04:00
0ip
48daf83a30 #763: Use spaces instead of tabs 2012-06-13 13:56:09 +03:00
Clark Boylan
2cbe29eb45 Fix pad.js' customStart. 
Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
 2012-06-12 14:20:54 -07: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
Jordan Hollinger
23075138b9 Lock down npm version to avaoid bug in later version 2012-06-12 11:03:09 -04:00
Jordan Hollinger
486f7c904e Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768 2012-06-11 23:33:17 -04:00
Jordan Hollinger
d5faefdeae Bugfix to setPadHTML. resolves #764 2012-06-09 10:53:51 -04:00
Egil Moeller
3338db9485 Bugfixes 2012-06-05 13:32:33 +02:00
Egil Moeller
cf2f0b72a3 More plugin information 2012-06-04 14:33:38 +02:00
John McLear
dc678a458f Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads 
Timeslider realtimeupdate+readonly pads
 2012-05-30 11:07:25 -07:00
Egil Moeller
ad68a6e3bf Bugfix for Chads new toolbar styling 2012-05-30 17:41:43 +02:00
Egil Moeller
27f25b8c61 Added hook to catch edit events 2012-05-30 17:18:43 +02:00
Egil Moeller
357ca73a99 Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication. 2012-05-30 10:00:36 +02:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
 2012-05-29 21:26:12 +02:00
John McLear
dfd81b79d4 Merge pull request #738 from cweider/packaging 
Packaging
 2012-05-28 17:08:23 -07:00
Chad Weider
819fb76dcd These definitions are meaningless. 2012-05-28 16:43:20 -07:00
Chad Weider
a28bbd0b3f Definition will not have an effect if already defined - force redefinition. 2012-05-28 16:43:20 -07:00
Chad Weider
774e2a1517 Fix indentation. 2012-05-28 16:43:20 -07:00
John McLear
95b9cf4f62 Merge pull request #737 from cweider/packaging 
Packaging
 2012-05-28 15:28:50 -07:00
Chad Weider
a8340dfbbe Remove the libraries that are a part of ace2_common package. 2012-05-28 15:14:52 -07:00
Chad Weider
7f9bfd6b26 Add comments to templates. 2012-05-28 15:14:52 -07:00
Chad Weider
96ab3dc3b4 jQuery is packaged - this is pure duplication. 2012-05-28 15:14:52 -07:00
Chad Weider
d5ac2bfb71 Explicitly require jQuery before using it. 2012-05-28 15:14:52 -07:00
Chad Weider
595fc5710e Add ace2_common to bottom of the page includes. 2012-05-28 15:14:52 -07:00