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

1759 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marcel Klehr
75c07ad569 Check in tools/doc/node_modules 2012-08-11 13:18:17 +02: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
Mark Holmquist
14da09dddd Add in docs for the new hook I just added 2012-08-10 09:49:43 -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
Marcel Klehr
453c68da19 Add doc generator. 2012-08-08 20:56:56 +02:00
Mark Holmquist
e491476a0f Added in docs for the HTTP call I just added 2012-08-08 10:26:18 -07: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
db4ae500a1 Fix markup. 2012-08-07 20:29:44 +02:00
Marcel Klehr
7e2820a674 Remove file endings from includes. 2012-08-07 20:21:11 +02:00
Marcel Klehr
70fb765118 Restructure headings. 2012-08-07 20:19:37 +02:00
Marcel Klehr
cb0066f7b4 Update socket.io 2012-08-07 19:40:45 +02:00
Marcel Klehr
5fac05a395 Add docs. 2012-08-03 22:04:06 +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
0e258c4229 Use latest node version in buildForWindows.sh 2012-08-01 23:42:52 +02:00
Marcel Klehr
2d941bf31d Fix buildForWindows 2012-08-01 23:42:03 +02:00
Marcel Klehr
3076ad9180 Exit on install if node is not installed. 2012-08-01 23:37:39 +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
Marcel Klehr
4b59a18f23 Update start.bat 2012-08-01 15:52:12 +02:00
Marcel Klehr
df38915b63 Simplify windows install 
Don't download node.exe and jquery on install
Check node version
Exit on error
 2012-08-01 15:51:14 +02:00
Matthias Bartelmeß
aa73cf9956 Merge pull request #913 from Wikinaut/fix-for-issue-890 
fix #890 test if console is available before writing to console.log
 2012-08-01 06:25:29 -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
John McLear
c9e8f7e7af Merge pull request #894 from cweider/remove-loopback 
Eliminate the loopback that has been causing so much trouble.
 2012-07-23 03:49:29 -07: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
Matthias Bartelmeß
4f79f74be5 Merge pull request #892 from ulikoehler/develop 
Exported HTML ist not W3C valid (has no title tag)
 2012-07-22 11:59:31 -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
Matthias Bartelmeß
76933f2b1d Merge pull request #888 from marcelklehr/feature/noscript-notification 
Notify the user if Javascript is disabled
 2012-07-19 04:10:47 -07: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