Commit graph

  • 68a01cc603 added numbrering logic + trigger on style update + visual render Jean-Tiare Le Bigot 2011-12-01 18:35:26 +01:00
  • 71fee11656 add the ability to set global password with http basic auth Alexandre Girard 2011-12-01 16:44:51 +01:00
  • b8e9131158 added an icon for ordered list Jean-Tiare Le Bigot 2011-12-01 15:09:50 +01:00
  • 07fa2ae598 Removed switch-construct 0ip 2011-12-01 15:00:12 +01:00
  • 5027ad4c92 fixed typo, added initial interface with still bullet button Jean-Tiare Le Bigot 2011-12-01 11:59:12 +01:00
  • 239742e80c added internal ordered list support. Numbering increment is not yet handled. small code factorisation. Added related CSS Jean-Tiare Le Bigot 2011-12-01 11:50:17 +01:00
  • 1a7b55523e Merge pull request #251 from bdcravens/patch-1 Peter 'Pita' Martischka 2011-11-29 15:41:44 -08:00
  • 733a1974f7 Merge 73de872bc9 into 9e509677dc GitHub Merge Button 2011-11-29 15:40:31 -08:00
  • 73de872bc9 Latest version of node (0.6.3+) has npm baked-in bdcravens 2011-11-29 17:39:19 -06:00
  • 4a6f8d0c98 Added YouTube + Vimeo support 0ip 2011-11-29 21:06:23 +01:00
  • 9e509677dc Merge pull request #231 from jtlebi/origin/shift-tab John McLear 2011-11-28 20:23:37 -08:00
  • b228aa5c74 Merge 2cc47211f9 into c8bfd21c03 GitHub Merge Button 2011-11-28 12:48:30 -08:00
  • c8bfd21c03 Merge branch 'master' of https://github.com/Pita/etherpad-lite John McLear 2011-11-28 20:48:16 +00:00
  • 769892a736 Show QR code on read only and non read only options John McLear 2011-11-28 20:45:27 +00:00
  • deedc17ca8 Added backup and patch files to .gitignore. Makes life a bit easier Peter 'Pita' Martischka 2011-11-28 11:28:06 -08:00
  • ec56ca75ad Fixed #135, thx to @Wikinaut Peter 'Pita' Martischka 2011-11-28 11:26:36 -08:00
  • e5d12f1d56 cherry picking @Yaco-Sistemas commit to fix IE 8 Peter 'Pita' Martischka 2011-11-28 11:18:47 -08:00
  • a2d3c6ddb2 Merge branch 'master' of git://github.com/Pita/etherpad-lite Peter 'Pita' Martischka 2011-11-28 11:16:33 -08:00
  • 6fcc3a24f1 Basic support for different media types [CSS] 0ip 2011-11-28 17:07:33 +01:00
  • 2e2cba82a3 Basic support for different media types 0ip 2011-11-28 17:02:37 +01:00
  • 054af3da77 Change embe this pad to share and embed this pad John McLear 2011-11-28 02:42:30 +00:00
  • 464b70a066 Merge branch 'master' of git://github.com/Pita/etherpad-lite Eric Martindale 2011-11-27 22:24:35 +00:00
  • 90d36471b1 Remove read only link and place all functionality into embed option sorts issue #246 John McLear 2011-11-27 21:04:11 +00:00
  • 19ee4865f4 Make the title changes Pita wanted which were show an increment and also fix the bug where it would keep increasing the title this is part of issue #125 John McLear 2011-11-27 20:39:47 +00:00
  • 5838e7ee7f fixed merge conflicts Kai Hermann 2011-08-30 16:47:16 +02:00
  • 2cc47211f9 one more 'one line fix'. Fixes bullet list auto replacing indented text whenever a new char is appended to it. This was caused by 'bullet' being hardcoded in a regular expression :/ Jean-Tiare Le Bigot 2011-11-27 19:10:22 +01:00
  • 0a1a869729 reverted my wrong change 9bb9f59a and reinserted setting chatAnimationIsStarted=true Wikinaut 2011-11-27 17:59:33 +01:00
  • c074994f66 Merge ae73b1101a into f465ebaab9 GitHub Merge Button 2011-11-27 08:35:32 -08:00
  • f465ebaab9 Being mentioned in a chat John McLear 2011-11-27 16:35:20 +00:00
  • b8e83b3fe6 Switched bars 0ip 2011-11-27 12:55:03 +01:00
  • 53654cd99c Merge 9bb9f59a29 into 88a8853fda GitHub Merge Button 2011-11-26 21:40:38 -08:00
  • 9bb9f59a29 removed redundant statements Wikinaut 2011-11-27 06:39:12 +01:00
  • 88a8853fda Added a extractPadData Script Peter 'Pita' Martischka 2011-11-27 05:32:31 +00:00
  • 9bfc78eac1 Applied 0ip's fix https://github.com/Pita/etherpad-lite/issues/233#issuecomment-2884908 John McLear 2011-11-27 01:11:51 +00:00
  • f33af4700b Merge pull request #242 from jaseg/master Peter 'Pita' Martischka 2011-11-26 12:23:44 -08:00
  • e108c68178 Merge b0976a292f into 3aacc0a1eb GitHub Merge Button 2011-11-26 12:22:07 -08:00
  • 3aacc0a1eb Merge pull request #222 from jhollinger/master Peter 'Pita' Martischka 2011-11-26 12:22:04 -08:00
  • 1603c2f5dd Small fix for elegance. jaseg 2011-11-26 21:05:52 +01:00
  • c0405a2856 Merge a491600487 into 33c51e1b01 GitHub Merge Button 2011-11-26 11:16:34 -08:00
  • 33c51e1b01 Second and final part of https://github.com/Pita/etherpad-lite/issues/233 John McLear 2011-11-26 19:16:32 +00:00
  • dd2d0d45f0 First part of https://github.com/Pita/etherpad-lite/issues/233 John McLear 2011-11-26 19:15:43 +00:00
  • 7ccfb37e90 mhm 0ip 2011-11-26 18:02:04 +01:00
  • 78bdd99472 Made buttons a bit wider. 0ip 2011-11-26 17:47:00 +01:00
  • 46a76cced2 Removed unnecessary whiteline and a link to a mysterious minified.js file. 0ip 2011-11-26 17:36:17 +01:00
  • 953e781de2 Optimized pad for mobile devices. 0ip 2011-11-26 17:24:44 +01:00
  • c27c21959f Optimized start page for mobile devices 0ip 2011-11-26 17:22:20 +01:00
  • 84e8fb94eb Merge pull request #239 from riseuplabs/master Peter 'Pita' Martischka 2011-11-25 22:18:43 -08:00
  • 958d43ef50 Merge 28c5e3ffb1 into 6bcd2886e9 GitHub Merge Button 2011-11-25 22:00:30 -08:00
  • 28c5e3ffb1 Fix jquery version test: #234 Micah Anderson 2011-11-26 00:58:47 -05:00
  • a491600487 editOnly should default to false Jordan 2011-11-25 21:24:00 -05:00
  • 6bcd2886e9 Fixed some problems with the database convertion Peter 'Pita' Martischka 2011-08-24 13:31:02 +01:00
  • 932ad0eeeb This may fixes the pdf convert issue Peter 'Pita' Martischka 2011-11-25 16:58:00 -08:00
  • 7296913cb0 fixed merge confilicts Peter 'Pita' Martischka 2011-11-25 16:56:08 -08:00
  • 54b912f352 Revert "This should fix the IE Cursor Issue #171" Peter 'Pita' Martischka 2011-11-25 16:10:21 -08:00
  • dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2011-11-25 16:08:24 -08:00
  • fa098d73cd Do a reconnect on network problems. After 10s it gives up Peter 'Pita' Martischka 2011-11-25 15:24:10 -08:00
  • 7d184a681a fix indenting while cursor is in the line Jean-Tiare Le Bigot 2011-11-26 00:02:25 +01:00
  • f61de98046 Merge pull request #232 from riseuplabs/master John McLear 2011-11-25 10:47:12 -08:00
  • f11ca330aa Merge 97e9eb84af into 40fcc83a05 GitHub Merge Button 2011-11-25 10:43:42 -08:00
  • 97e9eb84af fix for #224 Micah Anderson 2011-11-25 13:39:33 -05:00
  • 9c14dcd498 updated menu bar labels Jean-Tiare Le Bigot 2011-11-25 11:19:22 +01:00
  • caf8792974 applying/removing list now preserves the indentation level Jean-Tiare Le Bigot 2011-11-25 11:10:57 +01:00
  • ea2e7d0550 added support for (de)indent of regular text Jean-Tiare Le Bigot 2011-11-25 10:29:31 +01:00
  • 6b11ae330d added handling of de-indenting when already on higher level Jean-Tiare Le Bigot 2011-11-25 09:13:03 +01:00
  • 40fcc83a05 Merge pull request #227 from jtlebi/origin/shift-tab John McLear 2011-11-24 08:04:04 -08:00
  • b0d2728a85 Merge 42341f2b2f into 89e3778a2c GitHub Merge Button 2011-11-24 08:01:27 -08:00
  • 89e3778a2c Merge pull request #228 from alx/readonly-checkbox John McLear 2011-11-24 08:01:23 -08:00
  • b8e6820db8 Merge 7a7b3391fb into ccaa21a04a GitHub Merge Button 2011-11-24 07:39:00 -08:00
  • 7a7b3391fb add checkbox to limit number of inputs Alexandre Girard 2011-11-24 16:34:28 +01:00
  • 42341f2b2f handle shift+tab, trivial fix Jean-Tiare Le Bigot 2011-11-24 15:29:45 +01:00
  • ccaa21a04a Styling for the new embed options John McLear 2011-11-23 15:49:22 +00:00
  • dedd604125 Add support for embedding read only etc. John McLear 2011-11-23 15:46:34 +00:00
  • 2257cc0c1f auto-focus auto-open auto-close chat function Wikinaut-devel 2011-11-23 08:46:44 +01:00
  • 2db81050f1 Fixes "I did more testing and there are a few issues that comes up. If you type anything starting with www then that entire phrase becomes an anchor tag, even if there is a space after the www. So for example in the sentence "Put www at the start of the address" "www at" would become an anchor. The regex need updating to require a dot after the www, which I think would fix the issue, but my regex knowledge is not great." John McLear 2011-11-22 21:03:50 +00:00
  • 943f8c4682 Stupid syntax error due to last minute refactoring Lorenzo Gil Sanchez 2011-11-22 16:09:27 +01:00
  • e6de06b103 Transform multiline HTML into a single line stream to avoid spurious lines in the final result Lorenzo Gil Sanchez 2011-11-22 10:09:10 +01:00
  • 6297e628eb Permissions checks on pad and timeslider in server.js are redudant Jordan 2011-11-21 15:51:54 -05:00
  • 5e7c5d5dd3 Add editOnly option Jordan 2011-11-21 12:44:33 -05:00
  • 5630889fb0 A more precise description of the requireSession setting Jordan 2011-11-21 11:54:29 -05:00
  • 49e28ddc05 Merge pull request #220 from alx/apikey-trim John McLear 2011-11-21 07:57:17 -08:00
  • 3163738454 Merge 90e9d552f0 into 55a2f46ca9 GitHub Merge Button 2011-11-21 07:41:00 -08:00
  • 90e9d552f0 fix issue with newline in APIKEY.txt when checking api key Alexandre Girard 2011-11-21 16:39:54 +01:00
  • 9850ba43ee Implement a 'requireSession' mode, which requires any user to have a valid session Jordan 2011-11-21 01:45:37 -05:00
  • 33266915be Merge git://github.com/Pita/etherpad-lite Mark Schmale 2011-11-21 02:20:01 +01:00
  • 423724716b Merge a671140378 into 55a2f46ca9 GitHub Merge Button 2011-11-19 20:25:01 -08:00
  • 55a2f46ca9 https://github.com/Pita/etherpad-lite/issues/143 - needs to be included with earlier commit that should still be in master if pita didn't remove. This fixes the bug where a url without http:// wouldnt be detected as a url and then a subsequent bug I am the father of where it would detect it as a user, open a new page but fudge up the url and make the page fail to load. John McLear 2011-11-20 04:24:58 +00:00
  • 697201b3de Addresses https://github.com/Pita/etherpad-lite/issues/173 but needs a lot of testing and a word of warning, at current doing shift tab deletes the previous character as it emulates a backspace. John McLear 2011-11-20 03:52:19 +00:00
  • 2e79bd50a3 fixed socket.io logging Peter 'Pita' Martischka 2011-11-19 14:14:31 -08:00
  • 53bf7dc19d This should fix the IE Cursor Issue #171 Peter 'Pita' Martischka 2011-11-19 12:30:12 -08:00
  • 7a7869a602 Revert "Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. " Peter 'Pita' Martischka 2011-11-19 12:20:24 -08:00
  • a6b4260cc9 Updated JQuery to 1.7, thx to @wikinaut Peter 'Pita' Martischka 2011-11-19 12:18:21 -08:00
  • 2f16dff0ba Merge branch 'master' of https://github.com/jhollinger/etherpad-lite Peter 'Pita' Martischka 2011-11-19 12:08:57 -08:00
  • 54c8e46cdf Fixed Joes typo commit Peter 'Pita' Martischka 2011-11-19 12:07:39 -08:00
  • 0123fa0838 Merge branch 'master' of https://github.com/holtzermann17/etherpad-lite Peter 'Pita' Martischka 2011-11-19 11:58:33 -08:00
  • eac2e5f517 Merge 411984787a into e12049ef5b GitHub Merge Button 2011-11-19 11:27:38 -08:00
  • 06f8d59c2a Merge 0aa56136fe into e12049ef5b GitHub Merge Button 2011-11-19 11:27:38 -08:00
  • e12049ef5b Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2011-11-19 11:27:02 -08:00
  • 0aa56136fe Fix message typos Joe Corneli 2011-11-19 19:21:23 +00:00
  • d5e303ec9f Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. John McLear 2011-11-19 19:19:33 +00:00
  • a671140378 changing layout of page titles. padname, then '| Etherpad' string in the document.title Wikinaut 2011-11-19 10:40:57 +01:00