Commit graph

  • a743112170 Fix #626, Plugins don't work if pad is on a subdir 0ip 2012-04-19 19:44:44 +03:00
  • 4a7ab12859 Merge pull request #649 from rassie/patch-1 John McLear 2012-04-19 08:37:09 -07:00
  • 665d27cb61 Merge 576fe06682 into 9fe8a7530d GitHub Merge Button 2012-04-19 08:23:55 -07:00
  • 9fe8a7530d Merge pull request #641 from 0ip/highlight_module John McLear 2012-04-19 08:23:51 -07:00
  • 2f1524c521 Merge d75aeeaf8f into 064568d169 GitHub Merge Button 2012-04-19 08:18:52 -07:00
  • 064568d169 Merge pull request #653 from 0ip/plugins_page John McLear 2012-04-19 08:18:49 -07:00
  • 3663ea29e1 Merge 31909f6e60 into fc6e5177a9 GitHub Merge Button 2012-04-19 08:06:02 -07:00
  • 31909f6e60 Added viewport 0ip 2012-04-19 17:04:44 +02:00
  • ef88d2798e Restore overwritten plugin manager UI 0ip 2012-04-19 17:00:29 +02:00
  • b00a6204c6 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-19 15:12:12 +01:00
  • fc6e5177a9 Merge pull request #651 from redhog/master John McLear 2012-04-19 07:11:24 -07:00
  • e07095452a Merge ecac40d062 into 7ede4872b1 GitHub Merge Button 2012-04-19 07:09:00 -07:00
  • ecac40d062 Changed the authentication mechanism to support hooks Egil Moeller 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. Egil Moeller 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. Nikolai Prokoschenko 2012-04-19 16:44:19 +03:00
  • ac36a99a72 More general basic auth Egil Moeller 2012-04-19 14:25:12 +02:00
  • 96a0c0d0be getPad fails if an invalid padID is passed and only two function arguments Petar Dobrev 2012-04-19 14:45:26 +03: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. Martyn York 2012-04-18 14:44:25 -07:00
  • 4c1d94343f Better plugin admin interface Egil Moeller 2012-04-18 13:43:34 +02:00
  • d6f476312d Spelling bugfixes Egil Moeller 2012-04-18 10:16:41 +02:00
  • 7ede4872b1 Merge pull request #645 from redhog/master John McLear 2012-04-17 13:42:57 -07:00
  • 63c8351f07 Merge f80f9fc59f into 7cf4510bf5 GitHub Merge Button 2012-04-17 13:42:07 -07:00
  • 7ab7ee9f5e Plugin admin fixes Egil Moeller 2012-04-17 22:18:43 +02:00
  • 6f774bc6a5 Separated out the code for the plugin manager Egil Moeller 2012-04-11 18:07:19 +02:00
  • f80f9fc59f Merge commit 'd5120c9' into pita Egil Moeller 2012-04-17 22:34:45 +02:00
  • 3a62c6d2ab Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange Egil Moeller 2012-04-09 16:22:09 +02:00
  • fb5bbd122c Merge pull request #2 from etinquis/userlistfix Egil Möller 2012-04-17 12:10:38 -07:00
  • d224fe9e32 removed '+' Martyn York 2012-04-17 11:59:29 -07:00
  • d75aeeaf8f pad_editbar adapated hacky highlighting of currently opened module to recent changes 0ip 2012-04-16 15:23:19 +02:00
  • 3e47300587 template/pad.html removed id duplicates, moved revision button, converted TABS to spaces 0ip 2012-04-16 15:19:53 +02:00
  • 9cbb897c45 template/pad.html removed some whitespace 0ip 2012-04-16 15:13:07 +02:00
  • 086eef8fd0 Merge fcb4b3a7ba into 7cf4510bf5 GitHub Merge Button 2012-04-16 06:10:13 -07:00
  • fcb4b3a7ba admin/plugins: small css fixes 0ip 2012-04-16 15:08:02 +02:00
  • 4cfb2eb074 admin/plugins: added viewport 0ip 2012-04-16 15:03:11 +02:00
  • 39a9b62763 Disable users editing their username Mehmet Ali Elicin 2012-04-16 00:39:12 -07:00
  • 45456c2a4c Tooltip for author colors Mehmet Ali Elicin 2012-04-16 00:38:39 -07:00
  • 7cf4510bf5 Merge pull request #637 from fourplusone/feature/timeslider_cleanup John McLear 2012-04-15 12:11:46 -07:00
  • f530ec0576 Merge e664320b8c into 0e0e084077 GitHub Merge Button 2012-04-15 12:11:40 -07:00
  • 0e0e084077 Merge pull request #636 from fourplusone/fix/timeslider_authors John McLear 2012-04-15 12:11:38 -07:00
  • e664320b8c removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere Matthias Bartelmeß 2012-04-15 19:25:23 +02:00
  • 9e34dd18e6 Merge d834c42ffc into f4fe98265f GitHub Merge Button 2012-04-15 10:20:02 -07:00
  • d834c42ffc avoid missing anon. timeslider authors Matthias Bartelmeß 2012-04-15 19:18:29 +02:00
  • 9af3acd46f Merge d02643575e into 309e3b0994 GitHub Merge Button 2012-04-13 15:06:17 -07:00
  • d02643575e allows for multiple user logins along with live config file reading Jon Chiappetta 2012-04-13 17:58:14 -04:00
  • f4fe98265f Merge pull request #631 from jhollinger/develop John McLear 2012-04-13 14:51:57 -07:00
  • f6a0377c3a Merge 06f36664b8 into cba2c1f83a GitHub Merge Button 2012-04-13 14:23:24 -07:00
  • 06f36664b8 Fix re-enabling line numbers. issue #618 Jordan Hollinger 2012-04-13 17:21:07 -04:00
  • cba2c1f83a Merge pull request #630 from jhollinger/develop John McLear 2012-04-13 07:51:02 -07:00
  • ce46a6322a Merge 65ad9da155 into 309e3b0994 GitHub Merge Button 2012-04-13 06:21:02 -07:00
  • f578679581 Merge 362ef454b8 into 3dd24bdf6f GitHub Merge Button 2012-04-13 02:24:19 -07:00
  • 92533c47fe Merge 362ef454b8 into 309e3b0994 GitHub Merge Button 2012-04-13 02:20:35 -07:00
  • 362ef454b8 Don't block static paths with http auth Jordan Hollinger 2012-04-13 05:17:48 -04:00
  • f4be70c45e add more blocks to pad.html Edy 2012-04-12 20:24:38 +02:00
  • 3dd24bdf6f forgot to remove a ',' ^.^ 0ip 2012-04-11 22:25:04 +03:00
  • 05fcf4ba4a Having "maxAge" twice doesn't double the fun 0ip 2012-04-11 22:22:28 +03:00
  • 940d35ee49 sort installed plugins Edy 2012-04-11 20:51:10 +02:00
  • eed18feed7 Merge pull request #624 from 0ip/admin_css John McLear 2012-04-11 10:46:49 -07:00
  • 7948e12c0b Merge 8fa54e2402 into 4f5ac851cc GitHub Merge Button 2012-04-11 10:46:35 -07:00
  • 8fa54e2402 admin interface styling and sensibility 0ip 2012-04-11 19:44:18 +02:00
  • 8ad457a30b Merge d5120c98d0 into 4f5ac851cc GitHub Merge Button 2012-04-11 08:06:45 -07:00
  • 4f5ac851cc Merge pull request #622 from cweider/fix-firefox John McLear 2012-04-11 05:28:39 -07:00
  • 44905c7f7e Merge e695c716e5 into 67d9f73ce9 GitHub Merge Button 2012-04-11 02:10:30 -07:00
  • e695c716e5 Work around strange order of execution bug in Firefox. Fixes #620 Chad Weider 2012-04-11 02:01:53 -07:00
  • b767192c58 Revert "Made it possible to disable minification again" Chad Weider 2012-04-11 01:54:16 -07:00
  • b6e9c2ccce Merge fac69d4a68 into 309e3b0994 GitHub Merge Button 2012-04-11 02:04:34 -07:00
  • fac69d4a68 Work around strange order of execution bug in Firefox. Fixes #620 Chad Weider 2012-04-11 02:01:53 -07:00
  • 0395318031 Revert "Made it possible to disable minification again" Chad Weider 2012-04-11 01:54:16 -07:00
  • 67d9f73ce9 Merge pull request #617 from 0ip/prefix John McLear 2012-04-09 09:16:51 -07:00
  • 590265a12e Merge 50c79df272 into 77936c6c12 GitHub Merge Button 2012-04-09 08:54:27 -07:00
  • 50c79df272 prefixed css files containing css3 attributes due to recently removed prefixfree.js 0ip 2012-04-09 17:52:43 +02:00
  • 77936c6c12 removed a weird plus 0ip 2012-04-09 18:42:09 +03:00
  • ad00aaaaef Merge branch 'develop' of git://github.com/Pita/etherpad-lite Egil Moeller 2012-04-09 16:43:10 +02:00
  • 30acd9abe8 Merge branch 'develop' of git://github.com/johnyma22/etherpad-lite Egil Moeller 2012-04-09 16:35:25 +02:00
  • f2b56e7628 Merge branch 'new' Egil Moeller 2012-04-09 16:22:20 +02:00
  • d2c180c91b Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange Egil Moeller 2012-04-09 16:22:09 +02:00
  • f9d8cea114 Merge pull request #612 from levu42/bug-user-scroll John McLear 2012-04-09 06:37:03 -07:00
  • fc1566582f Merge 9e063341ce into 49b4fdfce3 GitHub Merge Button 2012-04-09 06:25:32 -07:00
  • 49b4fdfce3 Merge pull request #616 from 0ip/develop John McLear 2012-04-09 06:25:29 -07:00
  • 112f9eaea7 Merge c3095bbd1b into 18038ddd50 GitHub Merge Button 2012-04-09 06:24:55 -07:00
  • c3095bbd1b improved userlist ux (prevent overlapping of objects) 0ip 2012-04-09 15:16:40 +02:00
  • 60eea0a3cf Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop 0ip 2012-04-09 15:10:08 +02:00
  • baf215fae6 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-04-09 13:49:06 +01:00
  • 18038ddd50 Merge pull request #614 from fourplusone/ace2_refactoring John McLear 2012-04-08 17:28:47 -07:00
  • bff91d01ea Merge c3ce00a82d into 4e1a088d22 GitHub Merge Button 2012-04-08 12:29:41 -07:00
  • c3ce00a82d added a comment on skiplist.js Matthias Bartelmeß 2012-04-08 21:21:52 +02:00
  • b7a0b36b5e ...well stupid error Matthias Bartelmeß 2012-04-08 21:21:30 +02:00
  • 2406800cd6 documentation on AttributeManager Matthias Bartelmeß 2012-04-08 21:21:05 +02:00
  • 4e1a088d22 Merge pull request #613 from prauscher/fix-apicall Peter 'Pita' Martischka 2012-04-08 10:54:33 -07:00
  • 37f6329d10 Merge 867cc94806 into 3478649973 GitHub Merge Button 2012-04-08 10:51:43 -07:00
  • 867cc94806 bugfix for some crashes through stack overflows Patrick Rauscher 2012-04-08 17:48:30 +00:00
  • 9e063341ce fix for bug 'userlist not scrolling' levu 2012-04-08 16:22:00 +02:00
  • 3478649973 Merge pull request #610 from prauscher/fix-api Peter 'Pita' Martischka 2012-04-07 07:22:11 -07:00
  • cfa0811c48 Merge 6da38fd8bc into 2435003403 GitHub Merge Button 2012-04-07 06:52:20 -07:00
  • 6cfa43cb97 Merge 811c20508a into 2435003403 GitHub Merge Button 2012-04-07 06:45:49 -07:00
  • 811c20508a Merge branch 'develop' of github.com:prauscher/etherpad-lite into develop Patrick Rauscher 2012-04-07 13:43:09 +00:00
  • f4282d38e5 bugfix to use the API again Patrick Rauscher 2012-04-07 15:25:37 +02:00
  • 085c01f5e7 Allow disabling Passwords by setting them to an empty string Patrick Rauscher 2012-04-07 00:33:24 +00:00
  • d0df0ff805 due to browser security-limitations, will now use cookie-values of parentUri / parentUriReadOnly if they exist. should fix issue #602 Patrick Rauscher 2012-04-06 04:49:07 +02:00
  • 9815f36a5a better fix for issue #602 Patrick Rauscher 2012-04-06 01:54:53 +00:00
  • a538cf13e7 issue #602 - will now take browsers position instead of iframe-source. will fail in cascaded framesets Patrick Rauscher 2012-04-06 01:32:44 +00:00