aa986ab954
Merge branch 'fix/editorloadingbox' into develop
2012-08-02 09:00:04 +02:00
2fd604973c
Remove the second occurrence of #editorloadingbox
2012-08-02 01:04:52 +02:00
db54ab4b36
Merge pull request #887 from psifertex/develop
...
adding basic numbered list support to dokuwiki export
2012-08-01 12:36:04 -07:00
c9bdd1196d
Merge pull request #872 from marcelklehr/feature/connectivity-toolbar
...
Nice popups instead of modals
2012-08-01 11:37:15 -07:00
11e601fbcd
fix #890 test if console is available before writing to console.log
2012-08-01 14:34:03 +02:00
58d5203110
Add a documentReady client_hook.
2012-07-26 12:24:59 +02:00
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
de907cd0db
Add loadSettings hook.
2012-07-25 10:58:30 +02:00
6f91facf49
Retain original onerror handler.
2012-07-23 15:03:20 +02:00
c3dcb08a2c
Remove console.log
2012-07-23 14:33:30 +02:00
fa3020dffd
Display errors occuring on page load to the user.
2012-07-23 14:12:36 +02:00
9d25dcc1f9
Merge branch 'develop' into feature/connectivity-toolbar
...
Conflicts:
src/templates/pad.html
2012-07-23 11:26:15 +02:00
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
14582d1eba
Escaped title using Security.escapeHTML()
2012-07-22 19:07:14 +02:00
8630de66bf
Added missing newline after closing title tag
2012-07-22 18:37:38 +02:00
90357e0cdc
Added <title> tag to make exported HTML valid
2012-07-21 21:19:44 +02:00
c3ddff3fa0
Notify the user, if JavaScript is disabled.
2012-07-19 11:34:14 +02:00
c0daf1aaaf
adding basic numbered list support to dokuwiki export
2012-07-19 00:59:15 -04:00
9aed433ad5
Fix #880 Remove call to padsavedrevs.handleIsFullyConnected
2012-07-18 15:54:53 +02:00
6b429b2ca1
Merge pull request #851 from marcelklehr/fix-settings.json
...
Fix settings.json
2012-07-17 10:27:18 -07:00
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
eb6be84150
Fix html/css
2012-07-15 16:03:12 +02:00
b1123d11b6
Correct path
2012-07-14 20:35:26 +03:00
4901adeac7
Fix timeslider.
2012-07-14 15:54:44 +02:00
1466fa03a4
Fix some minor mistakes.
2012-07-14 15:54:20 +02:00
2d0cf156af
Fix showModal animation.
...
New content shouldn' slide in before the containing popup.
2012-07-14 15:14:46 +02:00
4220d6bedd
Put loading git back in.
2012-07-14 15:12:21 +02:00
9a3cb2c727
Sort the toolbar buttons correctly.
2012-07-14 14:54:25 +02:00
444467bef2
Remove connectivity tollbar button.
2012-07-14 14:50:52 +02:00
8ab12ee69e
Only disable toolbar.
...
Make content available and allow scrolling
2012-07-14 14:46:02 +02:00
6bda1f8e4d
Fix padeditbar.toggleDropDown
...
Only call callback, if one was passed.
2012-07-13 09:13:22 +02:00
9e9cbd5ffa
Fix typo.
2012-07-13 08:24:02 +02:00
6da6a7f0d8
Use nice editbar popups for connection status instead of srceen-blocking modals.
2012-07-13 08:23:22 +02:00
dc9eda9364
Use Tinycon to display chat mentions in favicon.
2012-07-12 20:18:33 +02:00
ead379cf66
Merge pull request #853 from fourplusone/feature/async_handleMessage
...
async handle message
2012-07-12 03:50:37 -07:00
f12cb0dd58
Don't screw up, if chat is empty.
2012-07-12 10:34:11 +02:00
7653db36fe
Revert "option to stop autoscroll"
...
This reverts commit 6726ea6632
2012-07-12 10:23:55 +02:00
8a471e590a
Fix #581 Don't scroll chat automatically if user is not at the bottom
2012-07-11 22:30:03 +02:00
6726ea6632
option to stop autoscroll
2012-07-11 17:42:59 +01:00
dc09323d8f
Don't exit if no settings file was found.
2012-07-11 15:36:41 +02:00
f09dd0f3fb
Put toString() back in.
2012-07-11 15:34:33 +02:00
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
87f26334d1
Fix typo.
2012-07-10 21:55:35 +02:00
8858446678
Exit on error.
2012-07-10 21:38:14 +02:00
a7dd620b9f
Don't crash if setText isn't passed any text. issue #861
2012-07-10 00:53:55 -04:00
975171a86b
Make handleMessage async
2012-07-08 21:06:19 +02:00
4c8f69b7c5
Use v8 to parse settings.json
2012-07-08 18:59:46 +02:00
3a0015c357
remove unused _opt in favor of code size/readability
2012-07-08 11:51:04 +02:00
af3c57a120
Load npm to enable server to see the git revision.
2012-07-08 11:37:24 +02:00
9ff3aa0ee0
make /static/tests.html functional again,
...
added getLastEdited
2012-07-07 20:41:26 +02:00
6d5fe459f0
Bugfix to getLastEdited API method, issue #845
2012-07-07 13:22:27 -04:00
34fdfcb253
Merge pull request #840 from redhog/master
...
Bugfix for readonly timeslider
2012-07-05 10:34:55 -07:00
17b6103a3d
Bugfix for broken readonly timeslider
2012-07-05 19:33:20 +02:00
bc15ea5c15
Merge pull request #829 from marcelklehr/support-node-0.8
...
Support node 0.8
2012-07-05 09:54:25 -07:00
799a5768c7
Quick hack to hide ep_etherpad-lite in plugin list
2012-07-05 18:13:29 +02:00
42bbbd426f
Add latest versions of async, express and connect.
2012-07-05 18:11:18 +02:00
c01aaeefc1
Allow node v0.6.x and 0.8.x
2012-07-05 17:34:23 +02:00
a0548af021
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver
2012-07-03 23:32:37 +02:00
b438a278a1
Make the server restart on plugin install
2012-07-03 23:31:44 +02:00
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
9d35b51500
Replace path.exists with fs.exists
2012-06-30 18:57:59 +02:00
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
227477967f
Fix plugin loader
...
make it work on client side and with relative paths
2012-06-29 12:40:16 +02:00
b0d369883b
Fix plugin loader to work with windows paths (e.g. 'D:\foo\...')
2012-06-28 15:58:28 +02:00
711dee8f6b
Merge pull request #821 from marcelklehr/fix-contributor-api-methods
...
Fix contributor api methods
2012-06-27 12:12:41 -07:00
93b50d4a29
Some fixes to the contributor API methods
...
Mostly these are coding style adjustments
2012-06-27 21:02:41 +02:00
a717c11ab3
Merge pull request #819 from marcelklehr/contributor-api-methods
...
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
2012-06-27 11:31:25 -07:00
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
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
0bc01feb72
Merge pull request #818 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:09:14 -07:00
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
3d9a2360be
Merge pull request #817 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:01:40 -07:00
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
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
e4ff4021ab
Merge pull request #810 from redhog/aceEditEvent
...
Plugin/hook features&bugfixes
2012-06-22 03:53:50 -07:00
476cfc8da0
Merge branch 'master' into aceEditEvent
2012-06-22 12:12:15 +02:00
6f37c0aaa6
The pad name sanitizer shouldn't drop query params. issue #779
2012-06-13 15:20:29 -04:00
48daf83a30
#763 : Use spaces instead of tabs
2012-06-13 13:56:09 +03:00
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
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
23075138b9
Lock down npm version to avaoid bug in later version
2012-06-12 11:03:09 -04:00
486f7c904e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:33:17 -04:00
d5faefdeae
Bugfix to setPadHTML. resolves #764
2012-06-09 10:53:51 -04:00
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
dc678a458f
Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads
...
Timeslider realtimeupdate+readonly pads
2012-05-30 11:07:25 -07:00
ad68a6e3bf
Bugfix for Chads new toolbar styling
2012-05-30 17:41:43 +02:00
27f25b8c61
Added hook to catch edit events
2012-05-30 17:18:43 +02:00
357ca73a99
Bugfix for bug introduced by 96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6: jQuery is packaged - this is pure duplication.
2012-05-30 10:00:36 +02:00
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
dfd81b79d4
Merge pull request #738 from cweider/packaging
...
Packaging
2012-05-28 17:08:23 -07:00
819fb76dcd
These definitions are meaningless.
2012-05-28 16:43:20 -07:00
a28bbd0b3f
Definition will not have an effect if already defined - force redefinition.
2012-05-28 16:43:20 -07:00
774e2a1517
Fix indentation.
2012-05-28 16:43:20 -07:00
95b9cf4f62
Merge pull request #737 from cweider/packaging
...
Packaging
2012-05-28 15:28:50 -07:00
a8340dfbbe
Remove the libraries that are a part of ace2_common package.
2012-05-28 15:14:52 -07:00
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
c4c30bf725
Correct parent_require path.
2012-05-28 15:14:51 -07:00
299a90b3ba
Fix paths for ace files.
2012-05-28 15:14:51 -07:00
9def552d3c
Remove trailing comma added in e661f653b1. Fixes #733 .
2012-05-28 14:40:08 -07:00
d4b4ca0a5c
Center user icon and fix overlapping chat
2012-05-23 20:40:24 +03:00
26614bf2d5
You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594
2012-05-23 01:01:50 +02:00
d1c2d12150
Import Should now work in IE
2012-05-23 00:52:10 +02:00
dafa44e6b4
I hate how hacky this change is.
2012-05-23 00:51:03 +02:00
b27287ce37
Update src/node/handler/ImportHandler.js
2012-05-23 00:49:12 +02:00
c8b93f6ddc
Fix IE import
2012-05-23 00:46:56 +02:00
9c6731f3b8
No comet required on landing page
2012-05-22 21:30:50 +02:00
06c36f3023
fix #722 by better argument checking in PadMessageHandler.js
2012-05-22 09:31:28 +02:00
185a3bface
Add def. bg to <select> and remove useless style
2012-05-20 20:19:16 +03:00
fe0ea23299
Fix userlist now showing up
2012-05-20 16:02:51 +02:00
caa56dd32a
Add non-floating popups
2012-05-20 15:59:51 +02:00
19cf43d0a3
Style select (useful for plugins)
2012-05-20 15:38:12 +02:00
750b9d44df
Style selected text
2012-05-20 15:37:03 +02:00
205797cd83
Remove class duplicate
2012-05-20 15:35:41 +02:00
fbee7dabcf
Add grouped buttons
2012-05-20 15:29:10 +02:00
afe060e2b8
Remove even more old code
2012-05-20 14:53:30 +02:00
0d68cd23ba
Remove old CSS code
2012-05-20 14:48:02 +02:00
fbc2cb32b3
Merge pull request #705 from johnyma22/removeWordle
...
Remove wordle
2012-05-19 05:58:38 -07:00
53bfc380af
Merge pull request #703 from cweider/remove-onclick
...
Remove onclick
2012-05-19 05:41:49 -07:00
9f46678e5d
Bugfix for IE and document.domain
2012-05-18 18:57:18 +02:00
ee11338927
Merge pull request #709 from cweider/packaging
...
Packaging
2012-05-17 04:59:24 -07:00
e8639d87ce
fixes issue #707
...
Don't set cached cookies
2012-05-17 12:08:19 +02:00
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
a9eb2d4e31
Fix ordering of editer code loading operations.
2012-05-14 19:01:00 -07:00
9b0e2287aa
Add plugin framwork to common package.
2012-05-14 18:20:16 -07:00
1a2c6425e1
Extract ace2_common into its own package.
2012-05-14 18:20:16 -07:00
384523859e
Require ace2_common separately.
2012-05-14 18:20:16 -07:00
97c7842d19
Remove unused line.
2012-05-14 18:20:16 -07:00
4680bfaee8
Upgrade yajsml version.
...
Fixes parent-relative redirects and prints results more nicely.
2012-05-14 18:14:50 -07:00
d65092e067
Move id, '*link' to the link.
2012-05-14 17:11:05 -07:00
9942c577dc
Patch tablet styling.
2012-05-13 15:33:22 -07:00
5d0c853889
Remove unnecessary styles.
2012-05-13 15:33:22 -07:00
f802a79da6
Make styles less restrictive.
2012-05-13 15:33:22 -07:00
818c3ef40d
Shift button appearance onto anchor.
2012-05-13 15:33:22 -07:00
089e0227fd
Shift editbar styles around.
2012-05-13 15:33:22 -07:00
1ea889bfab
Anchors are not icons
2012-05-13 15:33:22 -07:00
2a3fce0cf1
The showusers control is an anchor.
2012-05-13 15:33:22 -07:00
ab8b2cae21
Remove nonsense styles.
2012-05-13 15:33:22 -07:00
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -07:00
def904dbed
remove wordle
2012-05-13 20:20:18 +01:00
916e52a1eb
Merge pull request #609 from prauscher/disable-passwords
...
Disable passwords
2012-05-13 06:55:47 -07:00
c70d88eedc
Merge pull request #667 from fourplusone/feature/cleaner_code
...
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13 06:51:58 -07:00
99ecadc0c3
Fix #655 , wrong located APIKEY.txt
2012-05-13 00:34:26 +03:00
476065b68d
Merge pull request #627 from edy-b/body-block
...
add more blocks to pad.html
2012-05-12 14:18:28 -07:00
c406d076de
Updated socket.io
2012-05-02 19:12:57 +03:00
47a257ff72
accidentally deleted an end block in last merge
2012-05-01 12:02:12 +02:00
1329e93639
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Conflicts:
src/templates/pad.html
2012-05-01 11:35:06 +02:00
64db697558
Fixed typos
2012-04-30 16:54:19 +02:00
7a09d97731
Fix #683 - Disabling authorship colors doesn't work
2012-04-30 17:40:29 +03:00
23cdb2a5c6
Removed QR-Code
2012-04-30 15:54:21 +02:00
cf54c23228
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Resolved conflicts:
src/templates/pad.html
2012-04-30 15:17:23 +02:00
96eb8ac004
100% is not needed here http://ragefac.es/416
2012-04-29 21:19:34 +03:00
bf568b3477
Merge pull request #682 from fourplusone/fix/fix-677
...
fixed plugins.js
2012-04-29 11:13:45 -07:00
fa622857b9
fixed plugins.js
2012-04-29 20:12:15 +02:00
122986798e
Merge pull request #681 from fourplusone/fix/fix-677
...
fixed socket.io in timeslider.js
2012-04-29 11:11:25 -07:00
cbb5a043b8
fixed socket.io in timeslider.js
2012-04-29 20:04:00 +02:00
a73192b10d
Merge pull request #680 from fourplusone/fix/fix-677
...
Fix #677
2012-04-29 10:57:35 -07:00
0e941b498e
fix #677
2012-04-29 19:54:38 +02:00
f6bdbddfcc
Merge pull request #679 from 0ip/highl_mod
...
Tidy up wobbly button highlighting code
2012-04-29 08:10:52 -07:00
2525f20ff4
Tidied up highlighting for currently opened module 2
2012-04-29 02:48:47 +02:00
4b272fe2e1
Tidied up highlighting for currently opened module
2012-04-29 01:00:31 +02:00
c11df112e8
templates/plugins.html Fixed relative paths
2012-04-28 22:00:15 +02:00
c173ebe197
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
2012-04-25 17:51:03 +02:00
513deef768
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
2012-04-25 10:23:58 +02:00
e559ef5640
Disable design mode in readonly pad
2012-04-23 16:41:41 +02:00
ba3430ebb7
Corect ReadOnly link
2012-04-23 16:20:55 +02:00
480d0b8e25
ReadOnly pad handling
2012-04-23 16:18:14 +02:00
ed7e254417
Disconnect handling and cleanup of unused code
2012-04-23 14:47:07 +02:00
e5a22423bb
Fixed timedelta problem
2012-04-23 14:20:17 +02:00
1faae5b756
Timeslider autoupdate on pad change
2012-04-23 13:29:27 +02:00
583743a3f9
Restored saved revision support
2012-04-23 12:58:04 +02:00
914d79ad20
Unified timeslider and pad editing protocol / component
2012-04-23 12:52:30 +02:00
18d0c81181
adding padutils to padmodals
2012-04-21 14:57:22 +02:00
a557f2414e
cssManager top is not used, so drop it
2012-04-21 13:47:11 +02:00
d554420f57
Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)
2012-04-21 01:23:13 +02:00
3798f53f94
Merge pull request #660 from redhog/master
...
Unbreak last pull request (I forgot a dependency)
2012-04-20 16:21:04 -07:00
d08f3ff5ee
Bugfix dependencies
2012-04-21 01:17:27 +02:00
9d9b7b7b47
Merge branch 'develop' into feature/cleaner_code
2012-04-21 00:34:32 +02:00
16edda7d46
luke warm fix.
2012-04-21 00:16:10 +02:00
a5210ab27d
Merge pull request #647 from etinquis/fixes
...
Fix + New Hook
2012-04-20 15:10:40 -07:00
8fefb551fc
less verbose startup, better log messages at startup
2012-04-20 22:44:10 +02:00
7f50e8f551
server.js can be called from console.
2012-04-20 22:40:33 +02:00
c90ef5aeb8
default dirty.db to current pwd, so no new directory has to be created
2012-04-20 22:39:16 +02:00
e9fc16a974
warn if dirty db is used
2012-04-20 17:03:37 +02:00
90bbf169b2
allow startup without settings file
2012-04-20 17:03:26 +02:00
6fc45d6252
added etherpad-lite to "bin" in package.json
2012-04-20 17:00:32 +02:00
b6be00c3ab
Merge pull request #659 from redhog/master
...
Oups, forgot a debug print in there in the last pull request
2012-04-20 06:12:34 -07:00
9691f02765
removing Minify.js.rej
2012-04-20 15:12:20 +02:00
9a67a3a1db
Removed debug print
2012-04-20 15:08:50 +02:00
0a9fcc267f
Merge pull request #658 from redhog/master
...
Bugfixes for when plugins are installed as dependencies for other plugins
2012-04-20 05:56:57 -07:00
72c972b256
Bugfix for recursive dependency-installation and paths
2012-04-20 14:37:53 +02:00
89ab73c868
removing commented out functions from cssmanager.js
2012-04-20 14:25:07 +02:00
8593b1905c
getRepHTML seems to be unused. Removing
2012-04-20 14:24:44 +02:00
709a3b1dbe
removing debug code in collab_client.js
2012-04-20 13:34:35 +02:00
ab7f7506b9
removed unused functions in collab_client
2012-04-20 13:32:43 +02:00
07ee836946
set view zoom is unused
2012-04-20 12:19:09 +02:00
e661f653b1
sharebox and Feedback are not used. Removing them
2012-04-20 12:15:09 +02:00
Marcel Klehr