Commit graph

  • 357dd0a7bc Graphics for h1 and h2 Nils Rokita 2011-12-12 15:28:40 +01:00
  • 5aff4a030d Select whole line by h1 and h2 Nils Rokita 2011-12-12 15:28:05 +01:00
  • 3ee2991e2f Merge dc729fadd5 into 609701961e GitHub Merge Button 2011-12-12 03:44:00 -08:00
  • dc729fadd5 Allowing brigther colors for users. ryrun 2011-12-12 12:38:35 +01:00
  • 609701961e Added some comments to help us documentating the code Peter 'Pita' Martischka 2011-12-04 15:33:56 +00:00
  • d20dcc7c57 fixed merge conflicts John McLear 2011-12-04 18:55:35 +00:00
  • 3401a7bc11 small css fix at the importexport panel Peter 'Pita' Martischka 2011-12-11 18:20:05 +01:00
  • c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00
  • dca621bb36 Merge 1603c2f5dd into 18ac89e374 GitHub Merge Button 2011-12-11 07:22:48 -08:00
  • 5828d3d982 Merge 40c5e70aa7 into 18ac89e374 GitHub Merge Button 2011-12-11 07:22:48 -08:00
  • 18ac89e374 Merge pull request #280 from 0ip/patch-6 John McLear 2011-12-11 07:22:45 -08:00
  • 2455047f84 Merge 4287cc283a into d41ba6f5f7 GitHub Merge Button 2011-12-10 09:04:27 -08:00
  • d41ba6f5f7 updated ueberDB Peter 'Pita' Martischka 2011-12-10 18:04:19 +01:00
  • 6684d6ed52 replaced all stop callbacks with customError callbacks. Fixes #270 Peter 'Pita' Martischka 2011-12-10 16:46:47 +01:00
  • 2726634200 Add h1 adn h2, h2 seems not to work jet, menu immage have to be drawn Nils Rokita 2011-12-10 14:36:21 +01:00
  • 22fd5ae33d updated ueberDB Peter 'Pita' Martischka 2011-12-10 12:37:51 +01:00
  • 3248ca4cbb added minimal CSS support to HTMLexport Jean-Tiare Le Bigot 2011-12-10 11:01:14 +01:00
  • 0a513bc1d7 editor CSS proposal Jean-Tiare Le Bigot 2011-12-10 10:33:33 +01:00
  • 7f34334eaf added ordered list support to HTML exporter. Was not that easy :). Also added a few comments to help the next guy Jean-Tiare Le Bigot 2011-12-09 19:49:46 +01:00
  • 4715900eeb renumbering should be OK in most situations now :). It is automatically triggered on delete and return key and executed only when necessary Jean-Tiare Le Bigot 2011-12-09 17:23:32 +01:00
  • 4078ad83da fixed ordered list disapearing when typing Jean-Tiare Le Bigot 2011-12-09 13:23:05 +01:00
  • a161b59601 Now working. The password can be set from within the pad editor. Currently there are only two remaining issues: 1 After the password is set, re-authentication is needed 2 The toolbar button does not yet have a nice icon jaseg 2011-12-08 22:45:54 +01:00
  • 49006a3b6a Don't make the globalPads too global ;) Peter 'Pita' Martischka 2011-12-08 23:32:51 +01:00
  • a1b66baa63 Merge branch 'master' of git://github.com/Pita/etherpad-lite Eric Martindale 2011-12-08 18:46:59 +00:00
  • a5ec736b4c improved return key behaviour in lists when on empty item Jean-Tiare Le Bigot 2011-12-08 19:23:21 +01:00
  • ff04714614 fix typo in both CSS Jean-Tiare Le Bigot 2011-12-08 17:50:27 +01:00
  • 06d5e345c0 fix renumbering when indented text is mixed with regular lists Jean-Tiare Le Bigot 2011-12-08 17:48:49 +01:00
  • 9fd50b3e9f fix suggestion for the list theming Jean-Tiare Le Bigot 2011-12-08 16:56:23 +01:00
  • 821b53fbc4 Merge branch 'master', remote-tracking branch 'upstream/master' Jean-Tiare Le Bigot 2011-12-08 16:38:35 +01:00
  • 226898eff0 bring back numbering increment Jean-Tiare Le Bigot 2011-12-08 16:31:02 +01:00
  • 0888bc94e1 fixed duplicated css rule Jean-Tiare Le Bigot 2011-12-08 16:28:47 +01:00
  • 308a20bf11 bring indentation and ordered list support to timeslider. Still miss numbering :/ Jean-Tiare Le Bigot 2011-12-08 16:21:38 +01:00
  • 4287cc283a Fix for disappearing chat 0ip 2011-12-07 15:14:52 +01:00
  • d9686c7646 Merge pull request #279 from ryrun/patch-1 Peter 'Pita' Martischka 2011-12-07 05:52:21 -08:00
  • 7ecda7592d Merge 9616d5631f into a444f11900 GitHub Merge Button 2011-12-07 05:27:39 -08:00
  • 9616d5631f Speed up line numbering of huge pads. Tested on chrome and firefox. Pad with more than 6000 lines will be loaded fast. It refresh first all current line numbers, then creates new with DocumentFragment and style.height info. Reflow(rebuild and rendering of dom) will be reduced to one for new ones, instead for each ones. ryrun 2011-12-07 14:23:28 +01:00
  • 40c5e70aa7 Add DokuWiki export Adrian Lang 2011-08-25 09:52:19 +02:00
  • c905fd76c1 Working as it should. Except you need to type in your password after you created the pad. But that I won't fix today. jaseg 2011-12-06 23:12:58 +01:00
  • e9f6a10039 Merged. jaseg 2011-12-06 22:01:58 +01:00
  • dc8ff69553 mod so one can set passwords a) for pads that are in no group and b) via the web interface jaseg 2011-12-06 22:00:42 +01:00
  • a444f11900 Merge pull request #275 from 0ip/patch-5 John McLear 2011-12-06 12:10:59 -08:00
  • 1f566ad465 Merge 89aac09c91 into 3bce184189 GitHub Merge Button 2011-12-06 09:54:59 -08:00
  • 89aac09c91 sorry for that, correct pad.html 0ip 2011-12-06 18:54:57 +01:00
  • 5363e2531a Merge 07fa2ae598 into 3bce184189 GitHub Merge Button 2011-12-06 09:51:19 -08:00
  • 3bce184189 Merge pull request #274 from 0ip/patch-4 John McLear 2011-12-06 09:51:15 -08:00
  • 95fe749791 Optimized index page for mobile devices 0ip 2011-12-06 18:48:28 +01:00
  • a4dad594d3 Optimized css for mobile devices 0ip 2011-12-06 18:46:40 +01:00
  • b615da194f Optimized index page for mobile devices 0ip 2011-12-06 18:45:16 +01:00
  • 9ad3aa0e4b Updated chat for mobile devices 0ip 2011-12-06 18:43:30 +01:00
  • d00a3a93f8 Merge 2dbe562bdc into 963d4ea2d5 GitHub Merge Button 2011-12-06 09:19:26 -08:00
  • 2dbe562bdc Fix for 'Fix IE8 userpicker color issue' :) 0ip 2011-12-06 18:18:38 +01:00
  • 963d4ea2d5 Merge pull request #272 from ppapadeas/patch-1 John McLear 2011-12-05 11:56:54 -08:00
  • 620d683366 Merge 3b1765bb23 into 6b20875355 GitHub Merge Button 2011-12-05 11:55:16 -08:00
  • 3b1765bb23 Defining minimum Height and Width of Serialbox Pierros Papadeas 2011-12-05 11:53:43 -08:00
  • 6b20875355 add a tool to check for data corruption on pads Peter 'Pita' Martischka 2011-12-05 18:24:59 +01:00
  • 2038659ac7 Fixed info error ISSUE #252 part2, whoops. John McLear 2011-12-04 22:29:33 +00:00
  • 0810915f2c Fixed info error ISSUE #252 John McLear 2011-12-04 22:28:00 +00:00
  • 8551b02e2b Merge 33266915be into 18f90866ae GitHub Merge Button 2011-12-04 13:02:20 -08:00
  • 18f90866ae fixed reconnect Peter 'Pita' Martischka 2011-12-04 22:01:49 +01:00
  • c230e3db2d Fix issue where chat increment would go up even if the chat box was in focus, makes sense, apologies this wasn't in first commit John McLear 2011-12-04 19:51:45 +00:00
  • 16e4fa9959 fixed numbers in orderd list Peter 'Pita' Martischka 2011-12-04 20:11:31 +01:00
  • 438bee7ef5 Support for Right to Left language support, this is part of a tutorial video I did to show how to pass options to ACE John McLear 2011-12-04 18:55:35 +00:00
  • 7075fbebe6 fixed a bug in auto reconnect Peter 'Pita' Martischka 2011-12-04 19:43:05 +01:00
  • 4986808782 updated nodejs windows version to 0.6.5 Peter 'Pita' Martischka 2011-12-04 19:05:33 +01:00
  • 8a6704beef reduced the httpAuth timeout to 1000ms Peter 'Pita' Martischka 2011-12-04 17:27:36 +01:00
  • a4eef2780e Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth Peter 'Pita' Martischka 2011-12-04 17:22:00 +01:00
  • b2f1f04b54 Add support for hiding QR code via a parameter John McLear 2011-12-04 15:33:56 +00:00
  • 990a559a09 When noColors is set hide the clearAuthorship colors button John McLear 2011-12-04 15:29:34 +00:00
  • a46a723b09 slight clean up John McLear 2011-12-04 15:26:14 +00:00
  • dea5b05198 Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233 John McLear 2011-12-04 15:16:50 +00:00
  • 82d54fd70a Fixes issue where etherpad ltie wont install deps because npm is 1.1 alpha-- Bit of a harsh fix but it works fine John McLear 2011-12-04 15:00:06 +00:00
  • 3c8ee3df20 removed docs created with doc.md, these docs were completly useless Peter 'Pita' Martischka 2011-12-04 17:12:27 +01:00
  • bfbdac10d3 fixed #250 Peter 'Pita' Martischka 2011-12-04 17:09:31 +01:00
  • 5c56e62d67 Changed all error handling to async-stacktrace style + fixed import/export on unix Peter 'Pita' Martischka 2011-12-04 16:50:02 +01:00
  • ec9b86509e Merge 601b74705e into 324e4a0528 GitHub Merge Button 2011-12-04 07:34:06 -08:00
  • 601b74705e Add support for hiding QR code via a parameter John McLear 2011-12-04 15:33:56 +00:00
  • 8256c71cd2 When noColors is set hide the clearAuthorship colors button John McLear 2011-12-04 15:29:34 +00:00
  • 457d4f180a slight clean up John McLear 2011-12-04 15:26:14 +00:00
  • e6eac69f55 Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233 John McLear 2011-12-04 15:16:50 +00:00
  • 5b95e445c3 Fixes issue where etherpad ltie wont install deps because npm is 1.1 alpha-- Bit of a harsh fix but it works fine John McLear 2011-12-04 15:00:06 +00:00
  • 66ea90208a Merge remote branch 'upstream/master' John McLear 2011-12-04 14:46:00 +00:00
  • db1ba6a65e Don't let express catch errors, let the process die Peter 'Pita' Martischka 2011-12-04 15:19:24 +01:00
  • c8b6b02693 Testing something John McLear 2011-12-04 14:10:06 +00:00
  • e44b41f4a3 Fixed the easysync test Peter 'Pita' Martischka 2011-12-03 21:32:52 +01:00
  • 1ec1cdabc3 fix for disappearing toolbar @ android 4 0ip 2011-12-03 15:10:54 +01:00
  • 05d7f09c84 semi-fullscreen menus 0ip 2011-12-03 15:06:07 +01:00
  • 6f31d432c6 fullscreen menu's + smaller qr code 0ip 2011-12-03 14:13:57 +01:00
  • 520b334431 Set width to device-width 0ip 2011-12-03 13:44:52 +01:00
  • 6763395239 Prevent displacements related to the device orientation 0ip 2011-12-03 13:35:14 +01:00
  • 478bc8599a Merge a520c1e112 into 324e4a0528 GitHub Merge Button 2011-12-02 14:00:41 -08:00
  • 324e4a0528 Merge pull request #265 from 0ip/patch-3 John McLear 2011-12-02 14:00:38 -08:00
  • bbf6c948d3 Merge 1cf52682df into ecc2779bba GitHub Merge Button 2011-12-02 13:50:21 -08:00
  • 1cf52682df 💅 Small fix for a recently introduced alignment-bug (10px are missing) + fixed gap between the checkbox and 'Read Only' @ Share and Embed dropdown 0ip 2011-12-02 22:47:29 +01:00
  • 7ac8000e2a Merge b8e83b3fe6 into ecc2779bba GitHub Merge Button 2011-12-02 11:43:37 -08:00
  • ecc2779bba Merge pull request #264 from 0ip/patch-3 John McLear 2011-12-02 11:43:35 -08:00
  • 63212b015e Merge 499e780c88 into 1a7b55523e GitHub Merge Button 2011-12-02 11:39:27 -08:00
  • 499e780c88 added related div to work properly 0ip 2011-12-02 20:39:23 +01:00
  • 495b48056b Minor bugfix: Solves http://j.mp/utOjbn 0ip 2011-12-02 20:36:02 +01:00
  • a520c1e112 change settings sample to avoid error when editing httpAuth Alexandre Girard 2011-12-02 14:42:42 +01:00
  • cd15ad24ab trivial, quick and dirty chrome fix Jean-Tiare Le Bigot 2011-12-02 09:34:17 +01:00