Commit Graph

899 Commits (82bda0b0ab16da5b18ccc893cb89ece63a3c321a)

Author SHA1 Message Date
John McLear 86902c2c0b Merge pull request #291 from jhollinger/export_revisions
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
John McLear 7232dff6db Merge pull request #306 from 0ip/patch-7
Disables line numbers on mobile devices (fix for #304 and #305)
2012-01-08 06:49:56 -08:00
John McLear dc2448d0e1 Merge pull request #313 from jhollinger/fix_ie_cursor
Fix cursor jump in IE when clicking edit buttons
2012-01-08 06:43:38 -08:00
John McLear 9443525b88 Merge pull request #318 from TimWolla/htmlValidity
Made pad.html more valid
2012-01-08 06:04:33 -08:00
TimWolla 12fc8226f0 Made pad.html more valid
- & -> &
- Removed duplicate ID in one Tag
2012-01-08 13:55:34 +01:00
Azul 7dcc7be8e0 get the proper git revision even when not started from node dir 2012-01-05 11:44:08 +01:00
Azul b1faa8e0f8 Make sure Minify.js finds its files 2012-01-05 11:44:07 +01:00
Azul 33ffda19b1 Load the settings even when not starting in node path 2012-01-05 11:44:07 +01:00
Jordan ca70a7772a Fix cursor jump in IE when clicking edit buttons 2012-01-02 20:45:31 -05: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
0ip 9203ac2362 (1) Support for x*720px phones (like Galaxy Nexus) (2) Fix for user popup 2011-12-31 18:16:50 +01:00
0ip 2481c1cb4f removed hackish code 2011-12-31 17:47:34 +01:00
0ip a9a17e7360 properly disables line numbers on mobile devices (fix for #304 and #305) 2011-12-31 17:46:10 +01: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
Jordan 2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
Jordan e8ef99fb72 Sanitize pad names 2011-12-16 15:41:11 -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
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