libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
730 commits 2 branches 0 tags 24 MiB
Commit graph

730 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Peter 'Pita' Martischka
49006a3b6a Don't make the globalPads too global ;) 2011-12-08 23:32:51 +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
John McLear
a46a723b09 slight clean up 2011-12-04 17:17:16 +01:00
John McLear
dea5b05198 Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233 2011-12-04 17:16:48 +01:00
John McLear
82d54fd70a Fixes issue where etherpad ltie wont install deps because npm is 1.1 alpha-- Bit of a harsh fix but it works fine 2011-12-04 17:16:12 +01:00
Peter 'Pita' Martischka
3c8ee3df20 removed docs created with doc.md, these docs were completly useless 2011-12-04 17:12:27 +01:00
Peter 'Pita' Martischka
bfbdac10d3 fixed #250 2011-12-04 17:09:31 +01:00
Peter 'Pita' Martischka
5c56e62d67 Changed all error handling to async-stacktrace style + fixed import/export on unix 2011-12-04 16:50:02 +01:00
Peter 'Pita' Martischka
db1ba6a65e Don't let express catch errors, let the process die 2011-12-04 15:19:24 +01:00
Peter 'Pita' Martischka
e44b41f4a3 Fixed the easysync test 2011-12-03 21:32:52 +01:00
John McLear
324e4a0528 Merge pull request #265 from 0ip/patch-3 
Another small UI-patch
 2011-12-02 14:00:38 -08:00
0ip
1cf52682df 💅 Small fix for a recently introduced alignment-bug (10px are missing) + fixed gap between the checkbox and 'Read Only' @ Share and Embed dropdown 2011-12-02 22:47:29 +01:00
John McLear
ecc2779bba Merge pull request #264 from 0ip/patch-3 
Minor bugfix: Solves http://j.mp/utOjbn
 2011-12-02 11:43:35 -08:00
0ip
499e780c88 added related div to work properly 2011-12-02 20:39:23 +01:00
0ip
495b48056b Minor bugfix: Solves http://j.mp/utOjbn 2011-12-02 20:36:02 +01:00
Alexandre Girard
a520c1e112 change settings sample to avoid error when editing httpAuth 2011-12-02 14:42:42 +01:00
Alexandre Girard
71fee11656 add the ability to set global password with http basic auth 2011-12-01 16:44:51 +01:00
Peter 'Pita' Martischka
1a7b55523e Merge pull request #251 from bdcravens/patch-1 
Latest version of node (0.6.3+) has npm baked-in
 2011-11-29 15:41:44 -08:00
bdcravens
73de872bc9 Latest version of node (0.6.3+) has npm baked-in 2011-11-29 17:39:19 -06:00
John McLear
9e509677dc Merge pull request #231 from jtlebi/origin/shift-tab 
(de)indent behaviour enhancement
 2011-11-28 20:23:37 -08:00