Commit graph

  • ae179ba01d Fix pad.js' customStart. Clark Boylan 2012-06-07 10:58:29 -07:00
  • 3338db9485 Bugfixes Egil Moeller 2012-06-05 13:32:33 +02:00
  • 63588bd11a Merge branch 'master' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-06-04 14:18:16 +01:00
  • de90f0db4e Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-06-04 14:18:11 +01:00
  • cc72868636 Merge pull request #757 from redhog/aceEditEvent John McLear 2012-06-04 06:17:09 -07:00
  • 23c9cbbac2 Merge 27f25b8c61 into e23da5127b GitHub Merge Button 2012-06-04 05:39:28 -07:00
  • cf2f0b72a3 More plugin information Egil Moeller 2012-06-04 14:33:38 +02:00
  • b5f001ce5f Merge fed33e76fa into e23da5127b GitHub Merge Button 2012-06-03 23:44:42 -07:00
  • 0ea94ae16d Merge debbced185 into e23da5127b GitHub Merge Button 2012-06-03 23:44:40 -07:00
  • e23da5127b No longer need bin/installDeps.sh John McLear 2012-05-30 23:59:06 +02:00
  • 3e44b0e0d5 Merge branch 'timeslider-realtimeupdate+readonly-pads' Egil Moeller 2012-05-30 23:01:47 +02:00
  • dc678a458f Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads John McLear 2012-05-30 11:07:25 -07:00
  • 7ca7a5c3fa Merge branch 'master' into timeslider-realtimeupdate+readonly-pads Egil Moeller 2012-05-30 19:31:33 +02:00
  • 83c2f8b640 Merge ad68a6e3bf into f032cddf66 GitHub Merge Button 2012-05-30 08:42:45 -07:00
  • ad68a6e3bf Bugfix for Chads new toolbar styling Egil Moeller 2012-05-30 17:41:43 +02:00
  • 27f25b8c61 Added hook to catch edit events Egil Moeller 2012-05-30 17:18:43 +02:00
  • f032cddf66 Merge pull request #743 from redhog/master John McLear 2012-05-30 04:59:26 -07:00
  • 4404831ac3 Merge 357ca73a99 into dfd81b79d4 GitHub Merge Button 2012-05-30 01:03:11 -07:00
  • 357ca73a99 Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication. Egil Moeller 2012-05-30 10:00:36 +02:00
  • afb868fd2b Update CHANGELOG.md John McLear 2012-05-30 00:20:03 +02:00
  • 96877bc2b6 Merge branch 'develop' Peter 'Pita' Martischka 2012-05-29 21:48:48 +01:00
  • 15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads Egil Moeller 2012-05-29 21:26:12 +02:00
  • dfd81b79d4 Merge pull request #738 from cweider/packaging John McLear 2012-05-28 17:08:23 -07:00
  • 5185f23ef2 Merge 819fb76dcd into 95b9cf4f62 GitHub Merge Button 2012-05-28 16:50:37 -07:00
  • 819fb76dcd These definitions are meaningless. Chad Weider 2012-05-28 16:38:26 -07:00
  • a28bbd0b3f Definition will not have an effect if already defined - force redefinition. Chad Weider 2012-05-28 16:38:02 -07:00
  • 774e2a1517 Fix indentation. Chad Weider 2012-05-28 15:43:39 -07:00
  • 95b9cf4f62 Merge pull request #737 from cweider/packaging John McLear 2012-05-28 15:28:50 -07:00
  • 3e2980506a Merge a8340dfbbe into cf9c250373 GitHub Merge Button 2012-05-28 15:19:24 -07:00
  • a8340dfbbe Remove the libraries that are a part of ace2_common package. Chad Weider 2012-05-28 13:15:08 -07:00
  • 7f9bfd6b26 Add comments to templates. Chad Weider 2012-05-28 13:55:19 -07:00
  • 96ab3dc3b4 jQuery is packaged - this is pure duplication. Chad Weider 2012-05-28 13:50:55 -07:00
  • d5ac2bfb71 Explicitly require jQuery before using it. Chad Weider 2012-05-28 14:01:05 -07:00
  • 595fc5710e Add ace2_common to bottom of the page includes. Chad Weider 2012-05-28 13:52:04 -07:00
  • c4c30bf725 Correct parent_require path. Chad Weider 2012-05-28 14:49:47 -07:00
  • 299a90b3ba Fix paths for ace files. Chad Weider 2012-05-28 13:36:26 -07:00
  • cf9c250373 Merge pull request #736 from cweider/fix-ie John McLear 2012-05-28 14:48:06 -07:00
  • 6e7da9e508 Merge 9def552d3c into bd07589e0f GitHub Merge Button 2012-05-28 14:41:44 -07:00
  • 9def552d3c Remove trailing comma added in e661f653b1. Fixes #733. Chad Weider 2012-05-28 14:39:12 -07:00
  • f4992fa40e Data written to document must be escaped. Chad Weider 2012-05-28 12:20:45 -07:00
  • 723f75b016 Make exception handler static named function. Chad Weider 2012-05-28 12:15:22 -07:00
  • bd07589e0f fixing start.bat so server begins.. John McLear 2012-05-28 20:19:49 +02:00
  • 50b061cb6a Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-05-28 19:09:43 +01:00
  • d4b4ca0a5c Center user icon and fix overlapping chat 0ip 2012-05-23 20:40:24 +03:00
  • 26614bf2d5 You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594 John McLear 2012-05-23 01:01:50 +02:00
  • d1c2d12150 Import Should now work in IE John McLear 2012-05-23 00:52:10 +02:00
  • dafa44e6b4 I hate how hacky this change is. John McLear 2012-05-23 00:51:03 +02:00
  • b27287ce37 Update src/node/handler/ImportHandler.js John McLear 2012-05-23 00:49:12 +02:00
  • c8b93f6ddc Fix IE import John McLear 2012-05-23 00:46:56 +02:00
  • 9c6731f3b8 No comet required on landing page John McLear 2012-05-22 21:30:50 +02:00
  • 5e5a4446bc Merge pull request #723 from fourplusone/fix/fix-722 John McLear 2012-05-22 05:31:48 -07:00
  • c30d2fde96 Merge pull request #724 from fourplusone/fix/fix-722-develop John McLear 2012-05-22 05:31:25 -07:00
  • 620c9fb43b Merge 06c36f3023 into 185a3bface GitHub Merge Button 2012-05-22 00:32:39 -07:00
  • 06c36f3023 fix #722 by better argument checking in PadMessageHandler.js Matthias Bartelmeß 2012-05-22 09:31:28 +02:00
  • bf85d600c7 Merge 54511a6cea into 309e3b0994 GitHub Merge Button 2012-05-22 00:28:27 -07:00
  • 54511a6cea fix #722 by better argument checking in PadMessageHandler.js Matthias Bartelmeß 2012-05-22 09:27:08 +02:00
  • 185a3bface Add def. bg to <select> and remove useless style 0ip 2012-05-20 20:19:16 +03:00
  • 28abd527bc Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-05-20 17:54:12 +01:00
  • a40475666c Merge pull request #719 from 0ip/fix_css John McLear 2012-05-20 09:52:31 -07:00
  • dc82c5f3aa Merge fe0ea23299 into f3845c4020 GitHub Merge Button 2012-05-20 07:18:35 -07:00
  • fe0ea23299 Fix userlist now showing up 0ip 2012-05-20 16:02:51 +02:00
  • caa56dd32a Add non-floating popups 0ip 2012-05-20 15:59:51 +02:00
  • 19cf43d0a3 Style select (useful for plugins) 0ip 2012-05-20 15:38:12 +02:00
  • 750b9d44df Style selected text 0ip 2012-05-20 15:37:03 +02:00
  • 205797cd83 Remove class duplicate 0ip 2012-05-20 15:35:41 +02:00
  • fbee7dabcf Add grouped buttons 0ip 2012-05-20 15:29:10 +02:00
  • f3845c4020 Merge pull request #718 from 0ip/remove_old_css John McLear 2012-05-20 05:57:42 -07:00
  • 00c923a0d9 Merge afe060e2b8 into fbc2cb32b3 GitHub Merge Button 2012-05-20 05:55:29 -07:00
  • afe060e2b8 Remove even more old code 0ip 2012-05-20 14:53:30 +02:00
  • 0d68cd23ba Remove old CSS code 0ip 2012-05-20 14:48:02 +02:00
  • 102540f51b Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-05-19 13:58:48 +01:00
  • fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle John McLear 2012-05-19 05:58:38 -07:00
  • 2996b4352a Merge def904dbed into 53bfc380af GitHub Merge Button 2012-05-19 05:57:43 -07:00
  • bd30045d44 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop johnyma22 2012-05-19 13:42:29 +01:00
  • 53bfc380af Merge pull request #703 from cweider/remove-onclick John McLear 2012-05-19 05:41:49 -07:00
  • 108ec9c48a Merge d65092e067 into f3036eb124 GitHub Merge Button 2012-05-18 17:46:11 -07:00
  • f3036eb124 Merge pull request #715 from redhog/master John McLear 2012-05-18 10:19:44 -07:00
  • bd66243605 Merge 9f46678e5d into ee11338927 GitHub Merge Button 2012-05-18 09:59:54 -07:00
  • 9f46678e5d Bugfix for IE and document.domain Egil Moeller 2012-05-18 18:57:18 +02:00
  • ee11338927 Merge pull request #709 from cweider/packaging John McLear 2012-05-17 04:59:24 -07:00
  • 3052c6225f Merge a9eb2d4e31 into 1043d607d0 GitHub Merge Button 2012-05-17 04:57:42 -07:00
  • 1043d607d0 Merge pull request #712 from edy-b/issue-707 John McLear 2012-05-17 04:57:22 -07:00
  • cfc76b9cba Merge e8639d87ce into 916e52a1eb GitHub Merge Button 2012-05-17 03:13:18 -07:00
  • e8639d87ce fixes issue #707 Edy 2012-05-17 12:08:19 +02:00
  • fc946ffc33 Hide editing buttons when in readonly mode Egil Moeller 2012-05-17 12:03:38 +02:00
  • bb15ce513e Merge a9eb2d4e31 into 309e3b0994 GitHub Merge Button 2012-05-14 20:03:06 -07:00
  • a9eb2d4e31 Fix ordering of editer code loading operations. Chad Weider 2012-05-14 19:01:00 -07:00
  • 9b0e2287aa Add plugin framwork to common package. Chad Weider 2012-05-14 18:12:31 -07:00
  • 1a2c6425e1 Extract ace2_common into its own package. Chad Weider 2012-05-14 17:53:05 -07:00
  • 384523859e Require ace2_common separately. Chad Weider 2012-05-14 18:19:54 -07:00
  • 97c7842d19 Remove unused line. Chad Weider 2012-05-14 18:19:30 -07:00
  • 4680bfaee8 Upgrade yajsml version. Chad Weider 2012-05-14 18:12:56 -07:00
  • d65092e067 Move id, '*link' to the link. Chad Weider 2012-05-14 17:11:05 -07:00
  • 9942c577dc Patch tablet styling. Chad Weider 2012-05-13 15:22:21 -07:00
  • 5d0c853889 Remove unnecessary styles. Chad Weider 2012-02-29 17:06:06 -08:00
  • f802a79da6 Make styles less restrictive. Chad Weider 2012-02-29 17:00:58 -08:00
  • 818c3ef40d Shift button appearance onto anchor. Chad Weider 2012-02-29 15:29:08 -08:00
  • 089e0227fd Shift editbar styles around. Chad Weider 2012-02-29 16:37:21 -08:00
  • 1ea889bfab Anchors are not icons Chad Weider 2012-02-29 14:39:01 -08:00
  • 2a3fce0cf1 The showusers control is an anchor. Chad Weider 2012-02-29 16:47:16 -08:00