libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2425 commits 2 branches 0 tags 24 MiB
Commit graph

385 commits

Author SHA1 Message Date
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ß
093b7ab4bf added lineMarkerAttribute + more comments 2012-04-05 15:20:48 +02:00
Egil Moeller
8cd1298a16 Added init hook to install plugin database default content and the like 2012-04-05 01:48:12 +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ß
6c647baa02 Merge branch 'fix/client_plugins' into ace2_refactoring 2012-04-04 15:13:07 +02:00
Matthias Bartelmeß
4acbb11fd5 Merge branch 'develop' into feature/implicit_hooks 2012-04-04 15:04:10 +02:00
Matthias Bartelmeß
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
Matthias Bartelmeß
5a77979486 make jshint happy 2012-04-04 09:51:46 +02:00
Matthias Bartelmeß
b2173a1084 get rid of node.extend (since duplicated by underscorejs) 2012-04-04 09:40:18 +02:00
Matthias Bartelmeß
2dd60b0b6d Merge branch 'develop' into ace2_refactoring 2012-04-03 19:30:57 +02:00
Sofian Benaissa
c55f54b972 Fix the nocolor embed parameter 2012-04-02 16:35:18 -04: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
434252a321 Removed prefixfree as it breaks @import in css files 2012-04-01 22:55:04 +02:00
Egil Moeller
ba00144bcd Button styling bugfix 2012-04-01 15:20:51 +02:00
Egil Moeller
47c4f46237 Moved star image to right directory 2012-04-01 14:52:16 +02:00
Egil Moeller
08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00
Egil Moeller
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
Egil Moeller
b74447aa3c Styling generalization - use classes instead of id:s where applicable 2012-03-28 19:20:07 +02:00
Matthias Bartelmeß
35c0a38a01 Merge branch 'develop' into timeslider_authors 2012-03-28 08:31:17 +02:00
Egil Moeller
6120a0b7aa Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-03-27 22:36:48 +02:00
Egil Moeller
668725b892 Add jquery to ace iframe 2012-03-27 22:24:36 +02:00
Egil Moeller
8402cb118a One more exposed ace function 2012-03-27 22:24:16 +02:00
Egil Moeller
c65216a09f Added client side hook postAceInit 2012-03-27 22:23:55 +02:00
Egil Moeller
12600446c2 Better argument handling and defaults 2012-03-27 22:23:28 +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ß
e7ac8d6d4a use underscore in skipList 2012-03-27 11:44:21 +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
John McLear
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
Matthias Bartelmeß
e463273901 added UI to for unnamed authors 2012-03-25 15:48:31 +02:00
Matthias Bartelmeß
94a9795a04 CSS candy 2012-03-25 00:29:03 +01:00
Matthias Bartelmeß
371aee2e19 Added timeslider author UI 2012-03-24 20:35:45 +01:00
Matthias Bartelmeß
db67080ee9 Merge branch 'feature_jquery' into timeslider_authors 2012-03-24 19:01:39 +01:00
Matthias Bartelmeß
1478820d60 fixed error foreach error in timeslider.js 2012-03-24 19:01:04 +01:00
Matthias Bartelmeß
1789c6e1c5 proceed if plugin-definitions.json didn't load properly 2012-03-24 18:48:53 +01:00
Matthias Bartelmeß
208d88cc03 proceed if plugin-definitions.json didn't load properly 2012-03-24 13:29:15 +01:00
Matthias Bartelmeß
349bb595b9 corrected underscore path in hooks 2012-03-23 20:19:41 +01:00
Egil Moeller
d0ad90456e Merge commit '1a64a6c1' 2012-03-22 18:43:59 +01:00
Egil Moeller
5261ba5a69 Forward-ported some bugfixes from olad etherpad 2012-03-22 18:34:08 +01:00
Egil Moeller
d21cc1912c Better error message for broken JSON 2012-03-21 19:29:59 +01:00
Egil Moeller
1ca12b24e6 Bugfixes for plugin installer 2012-03-21 19:28:39 +01:00
Egil Moeller
7304a9ef3f Bugfix for misplaced hook call 2012-03-21 19:27:43 +01:00
Egil Moeller
c591efb352 Plugin list can now be reloaded 'live' 2012-03-19 17:16:49 +01:00
Egil Moeller
6fe7f2c2b2 Plugin list can now be reloaded 'live' 2012-03-19 16:59:57 +01:00
Matthias Bartelmeß
38742401c9 newSkipList() -> new SkipList() 2012-03-18 11:34:56 +01:00
Matthias Bartelmeß
902837f295 renaming AttributePoolFactory 2012-03-18 09:06:29 +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ß
d0dd746c8b added .keys method to objects, if not supported, fixes IE issue with pluginfw 2012-03-16 18:21:28 +01:00
Egil Moeller
51cae02e9d Show installed plugins and search new ones 2012-03-15 18:25:06 +01:00
Constantin Jucovschi
1a64a6c1c5 makes plugin architecture work in client-side from inside IFrames as well 2012-03-14 11:45:25 +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
Egil Moeller
05c2e0fde5 Made all html pages into eejs templates 2012-03-13 18:24:45 +01:00
Peter 'Pita' Martischka
cccd8a923c Merge git://github.com/Gared/etherpad-lite into develop 2012-03-11 16:07:34 -07:00
Chad Weider
0944670fb7 Merge remote-tracking branch 'main/master' into develop 2012-03-11 15:58:36 -07:00
Chad Weider
4e039d68da Correct indentation. 2012-03-10 15:57:46 -08:00
Chad Weider
6fac0750c2 These definitions have no need to be inside this closure. 2012-03-10 15:57:46 -08: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
Chad Weider
1a1f222221 Change paths. 2012-03-10 14:39:37 -08:00
Chad Weider
c6b8beabd3 Correct paths to reflect their being libraries. 2012-03-10 14:39:37 -08:00
Chad Weider
ca02ca05ae Remove unnecessary line. 2012-03-10 14:39:37 -08:00
Chad Weider
2fd9019792 Remove require code that is unnecessary and/or incorrect. 2012-03-10 14:39:37 -08:00
Chad Weider
648603126b Remove require changes in pushScriptsTo method. 
These duplicate `pushRequireScriptTo` at least, but mostly break things.
 2012-03-10 14:39:37 -08:00
Peter 'Pita' Martischka
9f03e5ec68 Output nicer exceptions in hook call 2012-03-04 20:32:57 +01:00
Peter 'Pita' Martischka
4e78a6b9cc Fix gitignore for custom files 2012-03-04 19:50:05 +01: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
6cd391d3fb Fixed timeslider which I broke a few minutes ago 2012-03-01 20:18:03 +01:00
Egil Moeller
df531a7b2b Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
Egil Moeller
81440cd856 Removed old pluginfw stuff 2012-03-01 19:00:58 +01:00
Egil Moeller
73aa0687b8 Client side hooks are now loaded and works 2012-03-01 18:45:02 +01:00
Egil Moeller
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
Egil Moeller
b20b86cdc8 Partial bugfix 2012-02-28 17:52:30 +01:00
Egil Moeller
0a4a7f538d Merge branch 'temo' 2012-02-26 22:02:02 +01:00
Egil Moeller
2c7b84ca3e Minify now supports plugins 2012-02-26 22:01:52 +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