024a26f272
Minify publishes its own mock request thing.
2012-09-03 14:37:26 -07:00
4413d498d8
Minify is a named function.
2012-09-03 14:35:36 -07:00
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
dad83d9b77
Document multi-session cookie feature
2012-09-02 19:51:40 +02:00
55cf1cabb5
fix prevent ESC key patch
2012-08-30 13:24:35 +09:00
521e76ae44
prevent ESC key
2012-08-30 12:00:27 +09:00
67088e5b7f
upd version resolve
2012-08-18 01:03:18 +02:00
e82588c332
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
2012-08-18 00:47:13 +02:00
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
da30c8983a
fix issue #955 : upd resolve library to 0.2.3
2012-08-17 00:45:02 +02:00
85f5eb38e4
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
2012-08-16 01:00:36 +02:00
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
48f1545777
Add Unicode normalization library
2012-08-13 17:06:25 +01:00
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
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
14c874b80e
Merge pull request #903 from marcelklehr/feature/hook-loadSettings2
...
[API hook] loadSettings
2012-08-12 08:54:31 -07:00
85191ca798
Merge pull request #905 from marcelklehr/feature/hook-documentReady
...
Add a documentReady client hook
2012-08-12 08:54:03 -07:00
132278a9d6
Merge pull request #928 from marcelklehr/fix/update-socket-io
...
Update socket.io
2012-08-12 08:53:18 -07:00
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
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
a42b2440ba
Merge pull request #943 from gedion/develop
...
Add a hook for utils/ExportHtml.js
2012-08-12 08:48:10 -07:00
e9b22e8ac3
fix indentation
2012-08-11 15:44:42 -05:00
4d11e49878
Update src/node/utils/ExportHtml.js
...
Added a hook for utils/ExportHtml.js
2012-08-11 13:08:28 -05:00
df7d7769c8
Added a hook for util/ExportHtml.js
2012-08-11 13:02:01 -05:00
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
d9d28369b2
Create author2sessions.sessionIDs if it doesn't exist yet.
2012-08-10 16:20:07 +02:00
d6a0cfc398
Create group2sessions.sessionIDs if it doesn't exist yet.
2012-08-09 11:15:26 +02:00
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
cb0066f7b4
Update socket.io
2012-08-07 19:40:45 +02:00
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
23bbe4ab5a
undo-xpopup seems to be unused
2012-04-20 12:04:10 +02:00
f809b0d6c8
removing de-facto noop
2012-04-20 12:03:11 +02:00
a743112170
Fix #626 , Plugins don't work if pad is on a subdir
2012-04-19 19:44:44 +03:00
4a7ab12859
Merge pull request #649 from rassie/patch-1
...
Corrected color picker: `jQuery(...).css('background-color')` returns…
2012-04-19 08:37:09 -07:00
9fe8a7530d
Merge pull request #641 from 0ip/highlight_module
...
Fix | Highlight currently opened module
2012-04-19 08:23:51 -07:00
31909f6e60
Added viewport
2012-04-19 17:04:44 +02:00
ef88d2798e
Restore overwritten plugin manager UI
2012-04-19 17:00:29 +02:00
ecac40d062
Changed the authentication mechanism to support hooks
2012-04-19 16:04:03 +02:00
7b39da2d69
Bugfix for callFirst to actually call call hooks until it finds one that returns non-empty, which is actually usefull, as opposed to just calling one hook.
2012-04-19 16:03:42 +02:00
576fe06682
Corrected color picker: `jQuery(...).css('background-color')` returns a hex notation in IE8 and `rgb()` in every other browser.
2012-04-19 16:44:19 +03:00
ac36a99a72
More general basic auth
2012-04-19 14:25:12 +02:00
da75b87d3c
added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe.
2012-04-18 14:44:25 -07:00
4c1d94343f
Better plugin admin interface
2012-04-18 13:43:34 +02:00
d6f476312d
Spelling bugfixes
2012-04-18 10:16:41 +02:00
7ab7ee9f5e
Plugin admin fixes
2012-04-17 22:40:53 +02:00
6f774bc6a5
Separated out the code for the plugin manager
2012-04-17 22:40:46 +02:00
f80f9fc59f
Merge commit 'd5120c9' into pita
2012-04-17 22:34:45 +02:00
3a62c6d2ab
Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange
2012-04-17 22:32:46 +02:00
d75aeeaf8f
pad_editbar adapated hacky highlighting of currently opened module to recent changes
2012-04-16 15:23:19 +02:00
3e47300587
template/pad.html removed id duplicates, moved revision button, converted TABS to spaces
2012-04-16 15:19:53 +02:00
9cbb897c45
template/pad.html removed some whitespace
2012-04-16 15:13:07 +02:00
7cf4510bf5
Merge pull request #637 from fourplusone/feature/timeslider_cleanup
...
Feature/timeslider cleanup
2012-04-15 12:11:46 -07:00
e664320b8c
removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere
2012-04-15 19:25:23 +02:00
d834c42ffc
avoid missing anon. timeslider authors
2012-04-15 19:18:29 +02:00
06f36664b8
Fix re-enabling line numbers. issue #618
2012-04-13 17:21:07 -04:00
362ef454b8
Don't block static paths with http auth
2012-04-13 05:17:48 -04:00
f4be70c45e
add more blocks to pad.html
...
... to allow plugins to be more flexible extending etherpad
2012-04-12 20:24:38 +02:00
8fa54e2402
admin interface styling and sensibility
2012-04-11 19:44:18 +02:00
e695c716e5
Work around strange order of execution bug in Firefox. Fixes #620
2012-04-11 02:08:50 -07:00
b767192c58
Revert "Made it possible to disable minification again"
...
This reverts commit 22eaa6ffc0
2012-04-11 02:08:50 -07:00
50c79df272
prefixed css files containing css3 attributes due to recently removed prefixfree.js
2012-04-09 17:52:43 +02:00
77936c6c12
removed a weird plus
2012-04-09 18:42:09 +03:00
f9d8cea114
Merge pull request #612 from levu42/bug-user-scroll
...
Userlists now scrolls if there are too many users
2012-04-09 06:37:03 -07:00
c3095bbd1b
improved userlist ux (prevent overlapping of objects)
2012-04-09 15:16:40 +02:00
18038ddd50
Merge pull request #614 from fourplusone/ace2_refactoring
...
Adding more hooks + some code refactoring
2012-04-08 17:28:47 -07:00
c3ce00a82d
added a comment on skiplist.js
2012-04-08 21:21:52 +02:00
b7a0b36b5e
...well stupid error
2012-04-08 21:21:30 +02:00
2406800cd6
documentation on AttributeManager
2012-04-08 21:21:05 +02:00
867cc94806
bugfix for some crashes through stack overflows
2012-04-08 17:48:30 +00:00
9e063341ce
fix for bug 'userlist not scrolling'
2012-04-08 16:22:00 +02:00
0e7cb78ec2
Allow disabling Passwords by setting them to an empty string
2012-04-07 13:41:00 +00:00
6da38fd8bc
bugfix to use the API again
2012-04-07 13:40:02 +00:00
62c9b1c25e
Merge branch 'fix/list-removal' into ace2_refactoring
2012-04-07 10:26:21 +02:00
8be1deda6f
Merge branch 'develop' into fix/list-removal
2012-04-07 03:42:16 +02:00
18dc111010
Fixing bug where lists get deleted when pressing enter
2012-04-07 03:42:05 +02:00
1e8e071693
Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoring
2012-04-07 02:14:43 +02:00
2db74150ee
linestylefilter now uses attributemanager to find lineattributemarkers
2012-04-07 02:14:19 +02:00
a0235126e4
syntax candy
2012-04-07 02:13:26 +02:00
6507614e45
made domline and content collector lineAttributes compatible
2012-04-07 02:12:42 +02:00
57e137f65b
Merge pull request #599 from fourplusone/ace2_refactoring
...
ACE2 refactoring
2012-04-06 17:07:49 -07:00
9efe838a32
removed unused variable
2012-04-07 01:57:10 +02:00
c79593569a
added aceEditorCSS hook
2012-04-07 01:40:13 +02:00
34f07efcfb
Delete key removes line attributes if prev line is not emtpy
2012-04-07 01:07:25 +02:00
38276e636c
postAceInit passes ace instance
2012-04-07 01:06:29 +02:00
0340c87996
Pad message handler detects lineattributemakers by asking Attribute manager
2012-04-07 01:05:25 +02:00
7418f08dc7
Added 2 new Hooks
...
+ aceInitialized is called when ace has been fully initialized
+ aceRegisterBlockElements allows to register new Block Elements with ace.
2012-04-07 01:02:50 +02:00
ae21eb30dd
Deselect highlighted editbar module button when userlist is opened
2012-04-06 22:32:19 +03:00
81f14fa157
Merge branch 'develop' into ace2_refactoring
2012-04-06 17:49:16 +02:00
39d0b149a9
corrected documentation on Attribute Manager
2012-04-06 17:44:34 +02:00
7766f8aaad
Merge pull request #591 from fourplusone/timeslider_authors
...
Timeslider authors
2012-04-05 16:38:55 -07:00
d61cdf57cc
Merge branch 'develop' into ace2_refactoring
2012-04-05 22:28:16 +02:00
9b1536ac10
fixing 'rep is not defined' error
2012-04-05 22:26:39 +02:00
151f1a0d71
Merge branch 'develop' into timeslider_authors
2012-04-05 21:54:26 +02:00
404ce9e452
css fixes
2012-04-05 21:53:04 +02:00
9e042ee942
Merge branch 'develop' into timeslider_authors
...
Conflicts:
src/static/css/pad.css
src/templates/timeslider.html
2012-04-05 21:47:59 +02:00
a3c9407ed6
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-04-05 20:14:48 +02:00
d5120c98d0
very quick admin interface styling and sensibility
2012-04-05 18:22:53 +01:00
66fdacf9cf
move css out of html
2012-04-05 18:04:17 +01:00
28aeb24f86
add some sense to the buttons on the plugin page
2012-04-05 18:00:38 +01:00
d3cc8e3374
Make the console show the url that admin/plugins is available at
2012-04-05 17:49:03 +01:00
ff9e407092
Minor coding style improvement. Does the same as before
2012-04-05 15:26:51 +02:00
2ccc70daf6
documented lineAndColumnFromChar
2012-04-05 15:25:17 +02:00
5833cb1037
renamed performDocumentApplyAttributesToRange to setAttributesOnRange and moved it to AttributeManager
2012-04-05 15:22:22 +02:00
093b7ab4bf
added lineMarkerAttribute + more comments
2012-04-05 15:20:48 +02:00
8cd1298a16
Added init hook to install plugin database default content and the like
2012-04-05 01:48:12 +02:00
4325f0b907
Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff
2012-04-05 01:45:14 +02:00
9f02972af4
remove debugger statement
2012-04-05 01:08:01 +02:00
60942b09a4
fixing lineHasMarker
2012-04-05 01:07:47 +02:00
1b383dc9b8
Merge branch 'develop' into ace2_refactoring
2012-04-05 00:51:18 +02:00
23cda77b65
added AttributeManager, ChangesetUtils
2012-04-05 00:50:04 +02:00
137e06d52b
Merge branch 'develop' into fix/max-age
2012-04-04 17:42:08 +02:00
5c4551b098
remove maxAge: undefined header, send maxAge even if set to 0
2012-04-04 17:41:03 +02:00
6c647baa02
Merge branch 'fix/client_plugins' into ace2_refactoring
2012-04-04 15:13:07 +02:00
f34e13f761
on plugin definitions, only expose plugins with client_hooks registered. dont expose 'package' property
2012-04-04 15:10:27 +02:00
4acbb11fd5
Merge branch 'develop' into feature/implicit_hooks
2012-04-04 15:04:10 +02:00
5115f74f66
use hook name as function name, if not specified
...
Example `"[hookName]": "ep_plugin/static/js/index:[hookName]"` becomes `"[hookName]": "ep_plugin/static/js/index"`
2012-04-04 15:03:28 +02:00
5a77979486
make jshint happy
2012-04-04 09:51:46 +02:00
b2173a1084
get rid of node.extend (since duplicated by underscorejs)
2012-04-04 09:40:18 +02:00
7fbcffb30b
fix crash if getFileCompressed fails (i.e. if /static/js is called)
2012-04-03 20:42:02 +02:00
2dd60b0b6d
Merge branch 'develop' into ace2_refactoring
2012-04-03 19:30:57 +02:00
396b586dbd
when no password is set, dont allow access to admin page
2012-04-03 14:17:19 +02:00
c55f54b972
Fix the nocolor embed parameter
2012-04-02 16:35:18 -04:00
9ecd864ac6
Merge pull request #557 from redhog/master
...
Templating system built on top of EJS and plugin installer
2012-04-02 12:42:38 -07:00
e06bf0e991
Basic auth for admin page
2012-04-02 18:45:37 +02:00
434252a321
Removed prefixfree as it breaks @import in css files
2012-04-01 22:55:04 +02:00
ba00144bcd
Button styling bugfix
2012-04-01 15:20:51 +02:00
47c4f46237
Moved star image to right directory
2012-04-01 14:52:16 +02:00
08cc3e128f
Bugfix for timeslider styling
2012-04-01 14:33:39 +02:00
33c53e61c2
Merge branch 'johnyma22'
...
Conflicts:
node/utils/Minify.js
src/static/js/pad.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_savedrevs.js
static/css/timeslider.css
static/pad.html
2012-04-01 13:27:38 +02:00
bc76913a6d
fix pitas fix
2012-03-31 18:16:31 +01:00
b74447aa3c
Styling generalization - use classes instead of id:s where applicable
2012-03-28 19:20:07 +02:00
35c0a38a01
Merge branch 'develop' into timeslider_authors
2012-03-28 08:31:17 +02:00
6120a0b7aa
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-03-27 22:36:48 +02:00
668725b892
Add jquery to ace iframe
2012-03-27 22:24:36 +02:00
8402cb118a
One more exposed ace function
2012-03-27 22:24:16 +02:00
c65216a09f
Added client side hook postAceInit
2012-03-27 22:23:55 +02:00
12600446c2
Better argument handling and defaults
2012-03-27 22:23:28 +02:00
120340600a
setupMozillaCaretHack is never called, so removing it should be safe
2012-03-27 12:29:22 +02:00
a82cc07881
replaced function(){} with noop
2012-03-27 12:28:47 +02:00
e7ac8d6d4a
use underscore in skipList
2012-03-27 11:44:21 +02:00
daca484747
Merge branch 'develop' into objectify_ep
...
Conflicts:
src/node/utils/tar.json
src/static/js/ace2_inner.js
2012-03-27 11:15:48 +02:00
beec69ac1c
Merge pull request #556 from fourplusone/feature_jquery
...
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
2012-03-26 08:10:58 -07:00
e463273901
added UI to for unnamed authors
2012-03-25 15:48:31 +02:00
94a9795a04
CSS candy
2012-03-25 00:29:03 +01:00
371aee2e19
Added timeslider author UI
2012-03-24 20:35:45 +01:00
db67080ee9
Merge branch 'feature_jquery' into timeslider_authors
2012-03-24 19:01:39 +01:00
1478820d60
fixed error foreach error in timeslider.js
2012-03-24 19:01:04 +01:00
1789c6e1c5
proceed if plugin-definitions.json didn't load properly
2012-03-24 18:48:53 +01:00
ef248555aa
Send the Content-Type header for plugin-definitions.json in the right format
2012-03-24 18:48:53 +01:00
04f3faac4b
re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.
2012-03-24 18:48:53 +01:00
208d88cc03
proceed if plugin-definitions.json didn't load properly
2012-03-24 13:29:15 +01:00
8bf481f27b
Send the Content-Type header for plugin-definitions.json in the right format
2012-03-24 13:28:17 +01:00
cf1be9b4bf
added underscore to tar.json
2012-03-23 20:22:49 +01:00
349bb595b9
corrected underscore path in hooks
2012-03-23 20:19:41 +01:00
c407ad3d34
re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.
2012-03-23 19:28:46 +01:00
d0ad90456e
Merge commit '1a64a6c1'
2012-03-22 18:43:59 +01:00
22eaa6ffc0
Made it possible to disable minification again
2012-03-22 18:35:06 +01:00
b8a4333d1b
Exposed require to ejs pages!
2012-03-22 18:34:38 +01:00
5261ba5a69
Forward-ported some bugfixes from olad etherpad
2012-03-22 18:34:08 +01:00
d21cc1912c
Better error message for broken JSON
2012-03-21 19:29:59 +01:00
50474dff1f
Some new blocks to allow plugins to add scripts, styles and modals
2012-03-21 19:29:06 +01:00
1ca12b24e6
Bugfixes for plugin installer
2012-03-21 19:28:39 +01:00
7304a9ef3f
Bugfix for misplaced hook call
2012-03-21 19:27:43 +01:00
37c0d279c1
Bugfix for when a block hook calls eejs.require recursively
2012-03-21 19:27:06 +01:00
c591efb352
Plugin list can now be reloaded 'live'
2012-03-19 17:16:49 +01:00
6fe7f2c2b2
Plugin list can now be reloaded 'live'
2012-03-19 16:59:57 +01:00
38742401c9
newSkipList() -> new SkipList()
2012-03-18 11:34:56 +01:00
902837f295
renaming AttributePoolFactory
2012-03-18 09:06:29 +01:00
8eb43a3ebf
replaceing AttributePoolFactory by AttributePool
2012-03-18 09:05:46 +01:00
af96509fbb
Plugin install/uninstall
2012-03-17 18:17:10 +01:00
e559df18ce
use underscore.js
2012-03-17 13:38:26 +01:00
692e77b4e5
Merge branch 'feature_jquery' into use_natives
...
Conflicts:
src/static/js/ace2_inner.js
src/static/js/pluginfw/plugins.js
2012-03-16 18:50:32 +01:00
d0dd746c8b
added .keys method to objects, if not supported, fixes IE issue with pluginfw
2012-03-16 18:21:28 +01:00
0e731a2645
Merge branch 'fix_crashes' into use_natives
2012-03-16 18:07:19 +01:00
81250cba15
Searching for plugins, plus handling async events from the server (progress)
2012-03-15 21:07:48 +01:00
51cae02e9d
Show installed plugins and search new ones
2012-03-15 18:25:06 +01:00
dbdc53307e
Bugfix to not have server required anywhere as it causes problems for command line script usage of modules
2012-03-14 18:50:13 +01:00
1a64a6c1c5
makes plugin architecture work in client-side from inside IFrames as well
2012-03-14 11:45:25 +01:00
e338aeb1a5
removing fixEvent which is not used anymore
2012-03-14 10:46:03 +01:00
3ef7e82045
added map and forEach which were accidentally removed
2012-03-14 10:45:02 +01:00
1cf3ffef4a
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
2012-03-14 01:41:05 +01:00
ede32726c1
check if sockets are available in PadMessageHandler
2012-03-14 01:32:16 +01:00
f34f0585bb
smashing errors caused by .forEach
2012-03-14 01:28:08 +01:00
b28bfe8e31
map / forEach use native impl, if available. ace2_common extends the prototype of Array, if not
2012-03-13 21:10:10 +01:00
a5366a0a16
Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu
2012-03-13 20:32:56 +01:00
05c2e0fde5
Made all html pages into eejs templates
2012-03-13 18:24:45 +01:00
5f7f382a9e
Merge branch 'master' into eejs
2012-03-13 17:51:42 +01:00
3ffed70850
Added inherit function
2012-03-13 17:42:15 +01:00
6fb0e00f03
Bugfixes for eejs
2012-03-13 17:31:40 +01:00
381e64a801
Merge remote-tracking branch 'remotes/pita/develop' into pita-plugins
...
Conflicts:
src/node/utils/caching_middleware.js
2012-03-13 17:08:38 +01:00
cccd8a923c
Merge git://github.com/Gared/etherpad-lite into develop
2012-03-11 16:07:34 -07:00
0944670fb7
Merge remote-tracking branch 'main/master' into develop
2012-03-11 15:58:36 -07:00
5ee0067d00
Merge branch 'plugin-fix-require' into plugin
2012-03-10 18:11:06 -08:00
3a115154e7
Migrate tar to use library paths.
2012-03-10 17:16:50 -08:00
4e039d68da
Correct indentation.
2012-03-10 15:57:46 -08:00
6fac0750c2
These definitions have no need to be inside this closure.
2012-03-10 15:57:46 -08:00
c1a903e32e
Correct ca91c0c403.
2012-03-10 15:57:46 -08:00
c0fc7f9b0c
Avoid orphaned cache files from breaking the caching layer.
...
(cherry picked from commit 57d0a2e803
2012-03-10 15:27:17 -08:00
ca91c0c403
Correct cache location and guard against bad directories.
2012-03-10 15:27:09 -08:00
ddda347f7a
Merge branch 'require-paths' into plugin
...
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
2012-03-10 15:08:09 -08:00
0d6ec8c04a
Minify implements virtual plugins resources.
2012-03-10 14:39:37 -08:00
1a1f222221
Change paths.
2012-03-10 14:39:37 -08:00
c6b8beabd3
Correct paths to reflect their being libraries.
2012-03-10 14:39:37 -08:00
ca02ca05ae
Remove unnecessary line.
2012-03-10 14:39:37 -08:00
2fd9019792
Remove require code that is unnecessary and/or incorrect.
2012-03-10 14:39:37 -08:00
648603126b
Remove require changes in `pushScriptsTo` method.
...
These duplicate `pushRequireScriptTo` at least, but mostly break things.
2012-03-10 14:39:37 -08:00
ee312672d3
This is duplicated by the contents of static.
2012-03-10 14:39:37 -08:00
384d768610
One more bug in cache dir setting
2012-03-08 21:47:18 +01:00
72571e5ef0
Bugfixing cache
2012-03-08 21:03:22 +01:00
f6212f452c
Bugfix
2012-03-08 21:01:01 +01:00
92dc3e59d6
First attempt to implement the block system from django templates on top of the npm module ejs.
2012-03-07 17:36:11 +01:00
7b518eeb2d
Fixing client side require, the minify code is completly unused now, very ugly solution
2012-03-04 23:45:33 +01:00
8b5925440a
Fix configuration of express
2012-03-04 21:23:05 +01:00
9f03e5ec68
Output nicer exceptions in hook call
2012-03-04 20:32:57 +01:00
4e78a6b9cc
Fix gitignore for custom files
2012-03-04 19:50:05 +01:00
f6b9b49ab4
Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually
2012-03-02 22:02:42 +01:00
ce5d2d8685
Merge branch 'pita'
...
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
6cd391d3fb
Fixed timeslider which I broke a few minutes ago
2012-03-01 20:18:03 +01:00
df531a7b2b
Made ace actually use the new hooks system, and removed remnants of old system
2012-03-01 19:22:02 +01:00
81440cd856
Removed old pluginfw stuff
2012-03-01 19:00:58 +01:00
73aa0687b8
Client side hooks are now loaded and works
2012-03-01 18:45:02 +01:00
35626df77b
Send plugin data to client
2012-02-29 16:05:44 +01:00
c9797a3714
Bugfix for dependency data circle
2012-02-29 16:05:25 +01:00
a894fcd4f9
Removed CommonCode entierly
2012-02-28 21:19:10 +01:00
cf191df0b8
So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage...
2012-02-28 21:14:31 +01:00
b20b86cdc8
Partial bugfix
2012-02-28 17:52:30 +01:00
0a4a7f538d
Merge branch 'temo'
2012-02-26 22:02:02 +01:00
2c7b84ca3e
Minify now supports plugins
2012-02-26 22:01:52 +01:00
763361a7c9
First stab at getting client side require(plugin/..) to work from within etherpad
2012-02-26 17:48:17 +01:00
fd5b7c1080
require(ep_pluginname/static/blabla); now works both on client and server
2012-02-26 15:34:03 +01:00
ac7ad6b519
Bugfix for git version extraction code
2012-02-26 14:14:54 +01:00
da52353ba3
The big rename of pluginbs from pluginomatic to ep
2012-02-26 13:54:32 +01:00
1239ce7f28
The Big Renaming - etherpad is now an NPM module
2012-02-26 13:07:51 +01:00
Chad Weider