public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,640 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1640 Commits (6bda1f8e4dbdebdf2e1cbf38f3380069e2224b2a)

Author SHA1 Message Date
John McLear 18038ddd50 Merge pull request #614 from fourplusone/ace2_refactoring 
Adding more hooks + some code refactoring
 2012-04-08 17:28:47 -07:00
Matthias Bartelmeß c3ce00a82d added a comment on skiplist.js 2012-04-08 21:21:52 +02:00
Matthias Bartelmeß b7a0b36b5e ...well stupid error 2012-04-08 21:21:30 +02:00
Matthias Bartelmeß 2406800cd6 documentation on AttributeManager 2012-04-08 21:21:05 +02:00
Peter 'Pita' Martischka 4e1a088d22 Merge pull request #613 from prauscher/fix-apicall 
bugfix for some crashes through stack overflows
 2012-04-08 10:54:33 -07:00
Patrick Rauscher 867cc94806 bugfix for some crashes through stack overflows 2012-04-08 17:48:30 +00:00
levu 9e063341ce fix for bug 'userlist not scrolling' 2012-04-08 16:22:00 +02:00
Peter 'Pita' Martischka 3478649973 Merge pull request #610 from prauscher/fix-api 
Fix api
 2012-04-07 07:22:11 -07:00
Patrick Rauscher 0e7cb78ec2 Allow disabling Passwords by setting them to an empty string 2012-04-07 13:41:00 +00:00
Patrick Rauscher 6da38fd8bc bugfix to use the API again 2012-04-07 13:40:02 +00:00
John McLear 2435003403 Merge pull request #607 from fourplusone/fix/list-removal 
Fix list removal
 2012-04-07 04:29:24 -07:00
Matthias Bartelmeß 62c9b1c25e Merge branch 'fix/list-removal' into ace2_refactoring 2012-04-07 10:26:21 +02:00
Matthias Bartelmeß 8be1deda6f Merge branch 'develop' into fix/list-removal 2012-04-07 03:42:16 +02:00
Matthias Bartelmeß 18dc111010 Fixing bug where lists get deleted when pressing enter 2012-04-07 03:42:05 +02:00
Matthias Bartelmeß 1e8e071693 Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoring 2012-04-07 02:14:43 +02:00
Matthias Bartelmeß 2db74150ee linestylefilter now uses attributemanager to find lineattributemarkers 2012-04-07 02:14:19 +02:00
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