mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 08:01:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
753 commits 217 branches 107 tags 78 MiB
Commit graph

753 commits

This branch
This branch
All branches
Author SHA1 Message Date
GitHub Merge Button
5e0befce3a Merge 3248ca4cbb into d73f053b5a 2012-01-02 06:48:03 -08:00
Peter 'Pita' Martischka
d73f053b5a Merge pull request #296 from jhollinger/api_fix 
Bugfix to API calling indexOf on an undefined padID
 2012-01-02 06:47:58 -08:00
Peter 'Pita' Martischka
4162f088a6 Merge pull request #302 from curiosity/master 
Fix the url for nodejs installation
 2012-01-02 06:47:18 -08:00
Sankar P
50f67a57ad Fix the url for nodejs installation 
Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
 2011-12-27 11:39:40 +05:30
Jordan
7c84d8cc74 Bugfix to API calling indexOf on an undefined padID 2011-12-22 00:22:36 -05:00
Peter 'Pita' Martischka
ddf1cd345c Update package.json 2011-12-14 21:36:33 +01:00
Peter 'Pita' Martischka
609701961e Added some comments to help us documentating the code 2011-12-11 19:45:40 +01:00
John McLear
d20dcc7c57 fixed merge conflicts 2011-12-11 18:45:41 +01:00
Peter 'Pita' Martischka
3401a7bc11 small css fix at the importexport panel 2011-12-11 18:20:05 +01:00
Peter 'Pita' Martischka
c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
John McLear
18ac89e374 Merge pull request #280 from 0ip/patch-6 
Fix for disappearing chat
 2011-12-11 07:22:45 -08:00
Peter 'Pita' Martischka
d41ba6f5f7 updated ueberDB 2011-12-10 18:04:19 +01:00
Peter 'Pita' Martischka
6684d6ed52 replaced all stop callbacks with customError callbacks. Fixes #270 2011-12-10 16:46:47 +01:00
Peter 'Pita' Martischka
22fd5ae33d updated ueberDB 2011-12-10 12:37:51 +01:00
Jean-Tiare Le Bigot
3248ca4cbb added minimal CSS support to HTMLexport 2011-12-10 11:01:14 +01:00
Jean-Tiare Le Bigot
0a513bc1d7 editor CSS proposal 2011-12-10 10:33:33 +01:00
Jean-Tiare Le Bigot
7f34334eaf added ordered list support to HTML exporter. Was not that easy :). Also added a few comments to help the next guy 2011-12-09 19:49:46 +01:00
Jean-Tiare Le Bigot
4715900eeb renumbering should be OK in most situations now :). It is automatically triggered on delete and return key and executed only when necessary 2011-12-09 17:23:32 +01:00
Jean-Tiare Le Bigot
4078ad83da fixed ordered list disapearing when typing 2011-12-09 13:23:05 +01:00
Peter 'Pita' Martischka
49006a3b6a Don't make the globalPads too global ;) 2011-12-08 23:32:51 +01:00
Jean-Tiare Le Bigot
a5ec736b4c improved return key behaviour in lists when on empty item 2011-12-08 19:23:21 +01:00
Jean-Tiare Le Bigot
ff04714614 fix typo in both CSS 2011-12-08 17:50:27 +01:00
Jean-Tiare Le Bigot
06d5e345c0 fix renumbering when indented text is mixed with regular lists 2011-12-08 17:48:49 +01:00
Jean-Tiare Le Bigot
9fd50b3e9f fix suggestion for the list theming 2011-12-08 16:56:23 +01:00
Jean-Tiare Le Bigot
226898eff0 bring back numbering increment 2011-12-08 16:31:02 +01:00
Jean-Tiare Le Bigot
0888bc94e1 fixed duplicated css rule 2011-12-08 16:28:47 +01:00
Jean-Tiare Le Bigot
308a20bf11 bring indentation and ordered list support to timeslider. Still miss numbering :/ 2011-12-08 16:21:38 +01:00
0ip
4287cc283a Fix for disappearing chat 2011-12-07 15:14:52 +01:00
Peter 'Pita' Martischka
d9686c7646 Merge pull request #279 from ryrun/patch-1 
Speed up line numbering of huge pads. Tested on chrome and firefox.
 2011-12-07 05:52:21 -08:00
ryrun
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. 2011-12-07 14:23:28 +01:00
Adrian Lang
40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
John McLear
a444f11900 Merge pull request #275 from 0ip/patch-5 
Mobile Patch [New]
 2011-12-06 12:10:59 -08:00
0ip
89aac09c91 sorry for that, correct pad.html 2011-12-06 18:54:57 +01:00
John McLear
3bce184189 Merge pull request #274 from 0ip/patch-4 
Fix for 'Fix IE8 userpicker color issue' :)
 2011-12-06 09:51:15 -08:00
0ip
95fe749791 Optimized index page for mobile devices 2011-12-06 18:48:28 +01:00
0ip
a4dad594d3 Optimized css for mobile devices 2011-12-06 18:46:40 +01:00
0ip
b615da194f Optimized index page for mobile devices 2011-12-06 18:45:16 +01:00
0ip
9ad3aa0e4b Updated chat for mobile devices 2011-12-06 18:43:30 +01:00
0ip
2dbe562bdc Fix for 'Fix IE8 userpicker color issue' :) 2011-12-06 18:18:38 +01:00
John McLear
963d4ea2d5 Merge pull request #272 from ppapadeas/patch-1 
Defining minimum Height and Width of Chatbox
 2011-12-05 11:56:54 -08:00
Pierros Papadeas
3b1765bb23 Defining minimum Height and Width of Serialbox 2011-12-05 11:53:43 -08:00
Peter 'Pita' Martischka
6b20875355 add a tool to check for data corruption on pads 2011-12-05 18:24:59 +01:00
Peter 'Pita' Martischka
18f90866ae fixed reconnect 2011-12-04 22:01:49 +01:00
Peter 'Pita' Martischka
16e4fa9959 fixed numbers in orderd list 2011-12-04 20:11:31 +01:00
Peter 'Pita' Martischka
7075fbebe6 fixed a bug in auto reconnect 2011-12-04 19:43:05 +01:00
Peter 'Pita' Martischka
4986808782 updated nodejs windows version to 0.6.5 2011-12-04 19:05:33 +01:00
Peter 'Pita' Martischka
8a6704beef reduced the httpAuth timeout to 1000ms 2011-12-04 17:27:36 +01:00
Peter 'Pita' Martischka
a4eef2780e Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth 2011-12-04 17:22:00 +01:00
John McLear
b2f1f04b54 Add support for hiding QR code via a parameter 2011-12-04 17:18:24 +01:00
John McLear
990a559a09 When noColors is set hide the clearAuthorship colors button 2011-12-04 17:17:44 +01:00