Commit Graph

1687 Commits

Author SHA1 Message Date
John McLear 132278a9d6 Merge pull request from marcelklehr/fix/update-socket-io
Update socket.io
2012-08-12 08:53:18 -07:00
John McLear ba6acd822e Merge pull request 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 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 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
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 from psifertex/develop
adding basic numbered list support to dokuwiki export
2012-08-01 12:36:04 -07:00
0ip c9bdd1196d Merge pull request from marcelklehr/feature/connectivity-toolbar
Nice popups instead of modals
2012-08-01 11:37:15 -07:00
Matthias Bartelmeß aa73cf9956 Merge pull request from Wikinaut/fix-for-issue-890
fix  test if console is available before writing to console.log
2012-08-01 06:25:29 -07:00
Wikinaut 11e601fbcd fix test if console is available before writing to console.log 2012-08-01 14:34:03 +02:00
odony a2bf577393 Fix - wonky bug with pasted lists
After 6507614e459dac868d3c76355ca013d13132bc79 the contentcollector does not properly "exit" lists back to the `none` listType anymore.
The repro steps on  seem to pass correctly after this change.
2012-07-25 13:45:53 +02:00
John McLear c9e8f7e7af Merge pull request 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 
2012-07-22 23:55:07 -07:00
Matthias Bartelmeß 4f79f74be5 Merge pull request 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 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 Remove call to padsavedrevs.handleIsFullyConnected 2012-07-18 15:54:53 +02:00
Matthias Bartelmeß 6b429b2ca1 Merge pull request from marcelklehr/fix-settings.json
Fix settings.json
2012-07-17 10:27:18 -07:00
John McLear 87908bd1cf Merge pull request from MarkTraceur/add-userhook
Add userJoinOrUpdate hook
2012-07-17 10:14:13 -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
John McLear 84cf741acf Merge pull request from marcelklehr/feature/nice-chat-bubble
Use Tinycon to display chat mentions in favicon.
2012-07-13 05:10:25 -07: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 from fourplusone/feature/async_handleMessage
async handle message
2012-07-12 03:50:37 -07:00
Matthias Bartelmeß 8882bbff6a Merge pull request from marcelklehr/fix/chat-autoscroll
Don't scroll chat automatically if user is not at the bottom
2012-07-12 03:26:12 -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 Don't scroll chat automatically if user is not at the bottom 2012-07-11 22:30:03 +02:00