Gedion
|
9be69ef258
|
fixed plugins
|
2012-09-11 16:21:14 -05:00 |
|
Gedion
|
c37c48cd12
|
added hooks and made some functions available to editor info object in ace
|
2012-09-08 13:45:33 -05:00 |
|
NAGOYA, Yoshihiko
|
55cf1cabb5
|
fix prevent ESC key patch
|
2012-08-30 13:24:35 +09:00 |
|
NAGOYA, Yoshihiko
|
521e76ae44
|
prevent ESC key
|
2012-08-30 12:00:27 +09:00 |
|
Marcel Klehr
|
9e9cbd5ffa
|
Fix typo.
|
2012-07-13 08:24:02 +02:00 |
|
Egil Moeller
|
27f25b8c61
|
Added hook to catch edit events
|
2012-05-30 17:18:43 +02:00 |
|
Matthias Bartelmeß
|
a557f2414e
|
cssManager top is not used, so drop it
|
2012-04-21 13:47:11 +02:00 |
|
Matthias Bartelmeß
|
8593b1905c
|
getRepHTML seems to be unused. Removing
|
2012-04-20 14:24:44 +02:00 |
|
Egil Moeller
|
3a62c6d2ab
|
Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange
|
2012-04-17 22:32:46 +02:00 |
|
Jordan Hollinger
|
06f36664b8
|
Fix re-enabling line numbers. issue #618
|
2012-04-13 17:21:07 -04:00 |
|
Matthias Bartelmeß
|
a0235126e4
|
syntax candy
|
2012-04-07 02:13:26 +02:00 |
|
Matthias Bartelmeß
|
34f07efcfb
|
Delete key removes line attributes if prev line is not emtpy
|
2012-04-07 01:07:25 +02:00 |
|
Matthias Bartelmeß
|
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 |
|
Matthias Bartelmeß
|
ff9e407092
|
Minor coding style improvement. Does the same as before
|
2012-04-05 15:26:51 +02:00 |
|
Matthias Bartelmeß
|
2ccc70daf6
|
documented lineAndColumnFromChar
|
2012-04-05 15:25:17 +02:00 |
|
Matthias Bartelmeß
|
5833cb1037
|
renamed performDocumentApplyAttributesToRange to setAttributesOnRange and moved it to AttributeManager
|
2012-04-05 15:22:22 +02:00 |
|
Matthias Bartelmeß
|
9f02972af4
|
remove debugger statement
|
2012-04-05 01:08:01 +02:00 |
|
Matthias Bartelmeß
|
60942b09a4
|
fixing lineHasMarker
|
2012-04-05 01:07:47 +02:00 |
|
Matthias Bartelmeß
|
23cda77b65
|
added AttributeManager, ChangesetUtils
|
2012-04-05 00:50:04 +02:00 |
|
Matthias Bartelmeß
|
2dd60b0b6d
|
Merge branch 'develop' into ace2_refactoring
|
2012-04-03 19:30:57 +02:00 |
|
John McLear
|
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 |
|
Egil Moeller
|
6120a0b7aa
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
|
2012-03-27 22:36:48 +02:00 |
|
Egil Moeller
|
8402cb118a
|
One more exposed ace function
|
2012-03-27 22:24:16 +02:00 |
|
Matthias Bartelmeß
|
120340600a
|
setupMozillaCaretHack is never called, so removing it should be safe
|
2012-03-27 12:29:22 +02:00 |
|
Matthias Bartelmeß
|
a82cc07881
|
replaced function(){} with noop
|
2012-03-27 12:28:47 +02:00 |
|
Matthias Bartelmeß
|
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 |
|
Egil Moeller
|
5261ba5a69
|
Forward-ported some bugfixes from olad etherpad
|
2012-03-22 18:34:08 +01:00 |
|
Matthias Bartelmeß
|
38742401c9
|
newSkipList() -> new SkipList()
|
2012-03-18 11:34:56 +01:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +01:00 |
|
Matthias Bartelmeß
|
e559df18ce
|
use underscore.js
|
2012-03-17 13:38:26 +01:00 |
|
Matthias Bartelmeß
|
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 |
|
Matthias Bartelmeß
|
e338aeb1a5
|
removing fixEvent which is not used anymore
|
2012-03-14 10:46:03 +01:00 |
|
Matthias Bartelmeß
|
3ef7e82045
|
added map and forEach which were accidentally removed
|
2012-03-14 10:45:02 +01:00 |
|
Matthias Bartelmeß
|
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 |
|
Matthias Bartelmeß
|
f34f0585bb
|
smashing errors caused by .forEach
|
2012-03-14 01:28:08 +01:00 |
|
Matthias Bartelmeß
|
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 |
|
Chad Weider
|
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 |
|
Egil Moeller
|
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 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|