Commit graph

  • aaad7d1428 restructuring save/load process of a pad, this makes it easier to extend the meta data of a pad Peter 'Pita' Martischka 2012-02-29 11:56:31 -05:00
  • f631e1e8ab Added saved revisions support Peter 'Pita' Martischka 2012-02-29 14:40:14 -05:00
  • 9c9e5db72d Add ability to export specific pad revisions John McLear 2012-03-29 19:40:55 +01:00
  • b74447aa3c Styling generalization - use classes instead of id:s where applicable Egil Moeller 2012-03-28 19:20:07 +02:00
  • 35c0a38a01 Merge branch 'develop' into timeslider_authors Matthias Bartelmeß 2012-03-28 08:31:17 +02:00
  • c960186f8d Merge pull request #563 from fourplusone/objectify_ep John McLear 2012-03-27 17:26:47 -07:00
  • 6120a0b7aa Merge branch 'develop' of git://github.com/Pita/etherpad-lite Egil Moeller 2012-03-27 22:36:48 +02:00
  • 668725b892 Add jquery to ace iframe Egil Moeller 2012-03-27 22:24:36 +02:00
  • 8402cb118a One more exposed ace function Egil Moeller 2012-03-27 22:24:16 +02:00
  • c65216a09f Added client side hook postAceInit Egil Moeller 2012-03-27 22:23:55 +02:00
  • 12600446c2 Better argument handling and defaults Egil Moeller 2012-03-27 22:23:28 +02:00
  • f67475d4af corrected json syntax errorallow maxAge 0 in settings.json Matthias Bartelmeß 2012-03-27 17:33:05 +02:00
  • a60205f3dc corrected json syntax error Matthias Bartelmeß 2012-03-27 16:31:51 +02:00
  • 082d5fae7e adding security.js, corrected indention Matthias Bartelmeß 2012-03-27 16:28:01 +02:00
  • d03966273f performance improvement by delivering jquery, rjquery, underscore, ace2_comon and security in a single file. Matthias Bartelmeß 2012-03-27 16:20:41 +02:00
  • 120340600a setupMozillaCaretHack is never called, so removing it should be safe Matthias Bartelmeß 2012-03-27 12:29:22 +02:00
  • a82cc07881 replaced function(){} with noop Matthias Bartelmeß 2012-03-27 12:28:47 +02:00
  • bf49f7c9ef Merge e7ac8d6d4a into beec69ac1c GitHub Merge Button 2012-03-27 02:44:32 -07:00
  • e7ac8d6d4a use underscore in skipList Matthias Bartelmeß 2012-03-27 11:44:21 +02:00
  • daca484747 Merge branch 'develop' into objectify_ep Matthias Bartelmeß 2012-03-27 11:15:48 +02:00
  • 9bd0b35aca Merge d99bb02d4b into beec69ac1c GitHub Merge Button 2012-03-26 12:58:06 -07:00
  • d99bb02d4b add vagrant support to etherpad-lite Robert Helmer 2012-03-26 12:57:55 -07:00
  • 7492d1b19c add vagrant support to etherpad-lite Robert Helmer 2012-03-25 20:52:22 -07:00
  • beec69ac1c Merge pull request #556 from fourplusone/feature_jquery John McLear 2012-03-26 08:10:58 -07:00
  • e463273901 added UI to for unnamed authors Matthias Bartelmeß 2012-03-25 15:48:31 +02:00
  • 94a9795a04 CSS candy Matthias Bartelmeß 2012-03-25 00:29:03 +01:00
  • 371aee2e19 Added timeslider author UI Matthias Bartelmeß 2012-03-24 20:35:45 +01:00
  • db67080ee9 Merge branch 'feature_jquery' into timeslider_authors Matthias Bartelmeß 2012-03-24 19:01:39 +01:00
  • 725df37a38 Merge 1478820d60 into f2ea56334d GitHub Merge Button 2012-03-24 11:01:15 -07:00
  • 1478820d60 fixed error foreach error in timeslider.js Matthias Bartelmeß 2012-03-24 19:01:04 +01:00
  • 1789c6e1c5 proceed if plugin-definitions.json didn't load properly Matthias Bartelmeß 2012-03-24 13:29:15 +01:00
  • ef248555aa Send the Content-Type header for plugin-definitions.json in the right format Matthias Bartelmeß 2012-03-24 13:28:17 +01:00
  • 04f3faac4b re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. Matthias Bartelmeß 2012-03-23 19:28:46 +01:00
  • 2858c5fc4e Merge ede32726c1 into f2ea56334d GitHub Merge Button 2012-03-24 07:58:08 -07:00
  • f2ea56334d Merge pull request #571 from fourplusone/fix_ie9_plugins John McLear 2012-03-24 07:58:07 -07:00
  • 57dee35d9e Merge 208d88cc03 into debdc340af GitHub Merge Button 2012-03-24 05:31:03 -07:00
  • 208d88cc03 proceed if plugin-definitions.json didn't load properly Matthias Bartelmeß 2012-03-24 13:29:15 +01:00
  • 8bf481f27b Send the Content-Type header for plugin-definitions.json in the right format Matthias Bartelmeß 2012-03-24 13:28:17 +01:00
  • cf1be9b4bf added underscore to tar.json Matthias Bartelmeß 2012-03-23 20:22:49 +01:00
  • 349bb595b9 corrected underscore path in hooks Matthias Bartelmeß 2012-03-23 20:19:41 +01:00
  • debdc340af Merge pull request #570 from fourplusone/develop John McLear 2012-03-23 11:49:52 -07:00
  • 210b3d4152 Merge c407ad3d34 into cccd8a923c GitHub Merge Button 2012-03-23 11:30:15 -07:00
  • c407ad3d34 re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. Matthias Bartelmeß 2012-03-23 19:28:46 +01:00
  • d0ad90456e Merge commit '1a64a6c1' Egil Moeller 2012-03-22 18:43:59 +01:00
  • 22eaa6ffc0 Made it possible to disable minification again Egil Moeller 2012-03-22 18:35:06 +01:00
  • b8a4333d1b Exposed require to ejs pages! Egil Moeller 2012-03-22 18:34:38 +01:00
  • 5261ba5a69 Forward-ported some bugfixes from olad etherpad Egil Moeller 2012-03-22 18:34:08 +01:00
  • d21cc1912c Better error message for broken JSON Egil Moeller 2012-03-21 19:29:59 +01:00
  • 50474dff1f Some new blocks to allow plugins to add scripts, styles and modals Egil Moeller 2012-03-21 19:29:06 +01:00
  • 1ca12b24e6 Bugfixes for plugin installer Egil Moeller 2012-03-21 19:28:39 +01:00
  • 7304a9ef3f Bugfix for misplaced hook call Egil Moeller 2012-03-21 19:27:43 +01:00
  • 37c0d279c1 Bugfix for when a block hook calls eejs.require recursively Egil Moeller 2012-03-21 19:27:06 +01:00
  • 9f8aa6a284 Merge 80c9d9c948 into cfb58a80a3 GitHub Merge Button 2012-03-20 19:30:42 -07:00
  • 80c9d9c948 use relative paths for custom/inner.* and outer.* Sofian Benaissa 2012-03-20 22:16:01 -04:00
  • 5d7a1734a4 Added outer.js and outer.css for custom theming and scripting of middle iframe Sofian Benaissa 2012-03-20 22:12:42 -04:00
  • cc06a63654 Added inner.js and inner.css for custom theming and scripting of innermost iframe Sofian Benaissa 2012-03-20 22:02:53 -04:00
  • c591efb352 Plugin list can now be reloaded 'live' Egil Moeller 2012-03-19 17:16:49 +01:00
  • 6fe7f2c2b2 Plugin list can now be reloaded 'live' Egil Moeller 2012-03-19 16:59:57 +01:00
  • 38742401c9 newSkipList() -> new SkipList() Matthias Bartelmeß 2012-03-18 11:34:56 +01:00
  • 902837f295 renaming AttributePoolFactory Matthias Bartelmeß 2012-03-18 09:06:29 +01:00
  • 8eb43a3ebf replaceing AttributePoolFactory by AttributePool Matthias Bartelmeß 2012-03-18 09:05:46 +01:00
  • af96509fbb Plugin install/uninstall Egil Moeller 2012-03-17 18:17:10 +01:00
  • e559df18ce use underscore.js Matthias Bartelmeß 2012-03-17 13:36:42 +01:00
  • 692e77b4e5 Merge branch 'feature_jquery' into use_natives Matthias Bartelmeß 2012-03-16 18:50:32 +01:00
  • d0dd746c8b added .keys method to objects, if not supported, fixes IE issue with pluginfw Matthias Bartelmeß 2012-03-16 18:21:28 +01:00
  • 0e731a2645 Merge branch 'fix_crashes' into use_natives Matthias Bartelmeß 2012-03-16 18:07:19 +01:00
  • 81250cba15 Searching for plugins, plus handling async events from the server (progress) Egil Moeller 2012-03-15 21:07:48 +01:00
  • 51cae02e9d Show installed plugins and search new ones Egil Moeller 2012-03-15 18:25:06 +01:00
  • dbdc53307e Bugfix to not have server required anywhere as it causes problems for command line script usage of modules Egil Moeller 2012-03-14 18:50:13 +01:00
  • 1a64a6c1c5 makes plugin architecture work in client-side from inside IFrames as well Constantin Jucovschi 2012-03-14 11:45:25 +01:00
  • 0431c15325 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into pita-plugin Constantin Jucovschi 2012-03-14 11:10:24 +01:00
  • e338aeb1a5 removing fixEvent which is not used anymore Matthias Bartelmeß 2012-03-14 10:46:03 +01:00
  • 3ef7e82045 added map and forEach which were accidentally removed Matthias Bartelmeß 2012-03-14 10:45:02 +01:00
  • 1cf3ffef4a added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner Matthias Bartelmeß 2012-03-14 01:41:05 +01:00
  • ede32726c1 check if sockets are available in PadMessageHandler Matthias Bartelmeß 2012-03-14 01:32:16 +01:00
  • f34f0585bb smashing errors caused by .forEach Matthias Bartelmeß 2012-03-13 22:44:33 +01:00
  • b28bfe8e31 map / forEach use native impl, if available. ace2_common extends the prototype of Array, if not Matthias Bartelmeß 2012-03-13 21:10:10 +01:00
  • a5366a0a16 Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu Egil Moeller 2012-03-13 20:32:56 +01:00
  • 70940521f2 Merge branch 'develop' of git://github.com/Pita/etherpad-lite Matthias Bartelmeß 2012-03-13 19:40:33 +01:00
  • 05c2e0fde5 Made all html pages into eejs templates Egil Moeller 2012-03-13 18:24:45 +01:00
  • 5f7f382a9e Merge branch 'master' into eejs Egil Moeller 2012-03-13 17:51:42 +01:00
  • 3ffed70850 Added inherit function Egil Moeller 2012-03-13 17:42:15 +01:00
  • 6fb0e00f03 Bugfixes for eejs Egil Moeller 2012-03-13 17:31:40 +01:00
  • 8756165ece Added a plugin-readme Egil Moeller 2012-03-13 17:08:57 +01:00
  • 381e64a801 Merge remote-tracking branch 'remotes/pita/develop' into pita-plugins Egil Moeller 2012-03-13 17:08:38 +01:00
  • c734bde7dd Fix the nocolor embed parameter Sofian Benaissa 2012-03-13 11:54:49 -03:00
  • cccd8a923c Merge git://github.com/Gared/etherpad-lite into develop Peter 'Pita' Martischka 2012-03-11 16:07:34 -07:00
  • cfb58a80a3 Merge git://github.com/Gared/etherpad-lite Peter 'Pita' Martischka 2012-03-11 16:07:29 -07:00
  • f2435878d0 Merge 051930e2c7 into a6d4858f09 GitHub Merge Button 2012-03-11 16:06:32 -07:00
  • f125af001f Merge branch 'develop' of github.com:Pita/etherpad-lite into develop Peter 'Pita' Martischka 2012-03-11 16:06:16 -07:00
  • 0b4ec7e1ad Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite into develop Peter 'Pita' Martischka 2012-03-11 16:04:26 -07:00
  • a6d4858f09 Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite Peter 'Pita' Martischka 2012-03-11 16:04:20 -07:00
  • 0944670fb7 Merge remote-tracking branch 'main/master' into develop Chad Weider 2012-03-11 15:58:36 -07:00
  • 4c45391b7c Merge ae5b12e018 into 6fe4034e7c GitHub Merge Button 2012-03-11 15:55:42 -07:00
  • 68d5bb2ce3 Merge 8619cd5784 into 6fe4034e7c GitHub Merge Button 2012-03-11 15:55:42 -07:00
  • 6fe4034e7c Merge pull request #541 from cweider/fix-minify Chad Weider 2012-03-11 15:55:37 -07:00
  • 3e390b1f60 Merge 29548244fd into 667df3f838 GitHub Merge Button 2012-03-11 15:55:07 -07:00
  • 667df3f838 Merge pull request #540 from cweider/fix-timeslider Chad Weider 2012-03-11 15:55:06 -07:00
  • d594b2db34 Merge branch 'require-paths' into plugin Chad Weider 2012-03-10 18:26:40 -08:00
  • 65ad9da155 Correct resource paths. Chad Weider 2012-03-10 18:19:40 -08:00