fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,374 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

1374 Commits

Author SHA1 Message Date
Matthias Bartelmeß a0235126e4 syntax candy 2012-04-07 02:13:26 +02:00
Matthias Bartelmeß 6507614e45 made domline and content collector lineAttributes compatible 2012-04-07 02:12:42 +02:00
John McLear 57e137f65b Merge pull request #599 from fourplusone/ace2_refactoring 
ACE2 refactoring
 2012-04-06 17:07:49 -07:00
Matthias Bartelmeß 9efe838a32 removed unused variable 2012-04-07 01:57:10 +02:00
Matthias Bartelmeß c79593569a added aceEditorCSS hook 2012-04-07 01:40:13 +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ß 38276e636c postAceInit passes ace instance 2012-04-07 01:06:29 +02:00
Matthias Bartelmeß 0340c87996 Pad message handler detects lineattributemakers by asking Attribute manager 2012-04-07 01:05: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
0ip ae21eb30dd Deselect highlighted editbar module button when userlist is opened 2012-04-06 22:32:19 +03:00
Matthias Bartelmeß 81f14fa157 Merge branch 'develop' into ace2_refactoring 2012-04-06 17:49:16 +02:00
Matthias Bartelmeß 39d0b149a9 corrected documentation on Attribute Manager 2012-04-06 17:44:34 +02:00
John McLear 7766f8aaad Merge pull request #591 from fourplusone/timeslider_authors 
Timeslider authors
 2012-04-05 16:38:55 -07:00
John McLear 5b87a2b1bb Merge pull request #601 from redhog/master 
Bugfix for document.domain, and added initialization hook
 2012-04-05 16:38:40 -07:00
Matthias Bartelmeß d61cdf57cc Merge branch 'develop' into ace2_refactoring 2012-04-05 22:28:16 +02:00
Matthias Bartelmeß 9b1536ac10 fixing 'rep is not defined' error 2012-04-05 22:26:39 +02:00
Matthias Bartelmeß 151f1a0d71 Merge branch 'develop' into timeslider_authors 2012-04-05 21:54:26 +02:00
Matthias Bartelmeß 404ce9e452 css fixes 2012-04-05 21:53:04 +02:00
Matthias Bartelmeß 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
Egil Moeller a3c9407ed6 Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-04-05 20:14:48 +02:00
Egil Moeller 65d32461e0 Ignoring .ep_initialized in git 2012-04-05 20:04:54 +02:00
johnyma22 d5120c98d0 very quick admin interface styling and sensibility 2012-04-05 18:22:53 +01:00
johnyma22 66fdacf9cf move css out of html 2012-04-05 18:04:17 +01:00
johnyma22 28aeb24f86 add some sense to the buttons on the plugin page 2012-04-05 18:00:38 +01:00
johnyma22 d3cc8e3374 Make the console show the url that admin/plugins is available at 2012-04-05 17:49:03 +01: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ß 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
Egil Moeller 4325f0b907 Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff 2012-04-05 01:45:14 +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ß 1b383dc9b8 Merge branch 'develop' into ace2_refactoring 2012-04-05 00:51:18 +02:00
Matthias Bartelmeß 23cda77b65 added AttributeManager, ChangesetUtils 2012-04-05 00:50:04 +02:00
John McLear be5aec7e20 Merge pull request #597 from fourplusone/fix/max-age 
Fix max-age
 2012-04-04 08:44:04 -07:00
Matthias Bartelmeß 137e06d52b Merge branch 'develop' into fix/max-age 2012-04-04 17:42:08 +02:00
Matthias Bartelmeß 5c4551b098 remove maxAge: undefined header, send maxAge even if set to 0 2012-04-04 17:41:03 +02:00
John McLear d7e94aa80a Merge pull request #596 from fourplusone/fix/client_plugins 
Fix/client plugins
 2012-04-04 08:40:05 -07:00
Matthias Bartelmeß 6c647baa02 Merge branch 'fix/client_plugins' into ace2_refactoring 2012-04-04 15:13:07 +02:00
Matthias Bartelmeß f34e13f761 on plugin definitions, only expose plugins with client_hooks registered. dont expose 'package' property 2012-04-04 15:10:27 +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
John McLear e387e25c05 Merge pull request #593 from fourplusone/nicer_code 
Removing node.extend
 2012-04-04 03:24:32 -07: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
John McLear 49593a1c8e Merge pull request #592 from fourplusone/fix_crash_minify_dir 
fix crash if getFileCompressed fails (i.e. if /static/js is called)
 2012-04-03 12:08:03 -07:00
Matthias Bartelmeß 7fbcffb30b fix crash if getFileCompressed fails (i.e. if /static/js is called) 2012-04-03 20:42:02 +02:00
Matthias Bartelmeß 2dd60b0b6d Merge branch 'develop' into ace2_refactoring 2012-04-03 19:30:57 +02:00
John McLear 8be52df515 Merge pull request #589 from fourplusone/fix_admin_undefined_auth 
Admin page security
 2012-04-03 07:51:18 -07:00