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
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
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
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
Matthias Bartelmeß
6b429b2ca1
Merge pull request #851 from marcelklehr/fix-settings.json
...
Fix settings.json
2012-07-17 10:27:18 -07:00
John McLear
87908bd1cf
Merge pull request #881 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 #871 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 #853 from fourplusone/feature/async_handleMessage
...
async handle message
2012-07-12 03:50:37 -07:00
Matthias Bartelmeß
8882bbff6a
Merge pull request #865 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 6726ea66320e3075451027d5362d35d77bebaf5d.
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
John McLear
72532fadc9
Merge pull request #863 from jhollinger/develop
...
Don't crash server if setText was given no text
2012-07-10 07:58:23 -07: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
John McLear
9617ace809
Merge pull request #849 from marcelklehr/fix-git-version-receiver
...
Fix git version receiver
2012-07-08 10:44:55 -07: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
