Commit Graph

395 Commits (548c527aaf1ae58fb16c89695d42e78b146ba839)

Author SHA1 Message Date
Chad Weider 548c527aaf Move exposure of `Ace2Editor` closer to the code that requires it. 2012-01-22 09:46:08 -08:00
Robin c0a0687fe9 It was definetely too late 2012-01-22 13:09:10 +01:00
0ip 3f8b03a900 Typo again 2012-01-22 02:15:02 +01:00
Robin 3c85a9cc6c Typo 2012-01-22 00:13:00 +01:00
Robin 300886da34 Removed duplicates 2012-01-22 00:10:06 +01:00
John McLear 9f0ca7cc44 Remove alt key from Z to stop Polish people feeling sad 2012-01-17 16:50:35 +00:00
Peter 'Pita' Martischka 8f887262b0 Merge pull request #335 from johnyma22/importInstructions
Added a string to let people know to install abiword to enable import
2012-01-15 12:50:55 -08:00
Peter 'Pita' Martischka a313c2570e Merge pull request #331 from cweider/packaging-improvement
Packaging improvement
2012-01-15 12:48:41 -08:00
John McLear eec22c4b70 Added a string to let people know to install abiword to enable import 2012-01-15 20:48:29 +00:00
Chad Weider 71a7c00abc Merge adjacent scripts. 2012-01-15 12:10:29 -08:00
Chad Weider a7bea30d83 Remove unnecessary quoting approach. 2012-01-15 11:27:08 -08:00
Chad Weider 9c91f16c71 Improve inlining of editor content.
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear 5f46ac2b01 Temporary fix that was breaking clicks inside of embedded pads 2012-01-15 18:24:18 +00:00
John McLear 6b49a56e01 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-15 17:59:42 +00:00
John McLear e14fd22284 fix large left padding 2012-01-15 17:59:19 +00:00
0ip 1767e0f6e8 Update static/css/pad.css 2012-01-15 18:55:33 +01:00
Robin 960a79b77b Added icon for ordered lists 2012-01-15 18:37:33 +01:00
John McLear f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Peter 'Pita' Martischka c45932c6b8 Merge pull request #329 from cweider/security
Security [HTML Escaping]
2012-01-14 15:22:12 -08:00
Chad Weider 387dd4a48b The value of all href attributes is escaped. 2012-01-14 14:50:23 -08:00
Chad Weider 6e36b59a59 All escaping functions replace HTML reserved characters. 2012-01-14 14:46:15 -08:00
Robin f08e68c8f9 Addition for 720px phones (forgot index.html) 2012-01-14 21:41:41 +01:00
John McLear 30da7357e5 Merge pull request #326 from 0ip/fileinputfix
Fixed file input readability in Chrome
2012-01-14 07:24:34 -08:00
Peter 'Pita' Martischka f9b0b10709 made 0ip images so that Pita likes them 2012-01-14 16:16:35 +01:00
Robin 42eee71295 Fixed file input readability in Chrome 2012-01-14 15:07:11 +01:00
Robin 8787897f60 Changed position values 2012-01-13 23:58:47 +01:00
Robin 20b63f1fa7 Merged and optimized icons 2012-01-13 23:58:01 +01:00
John McLear 642b716553 Merge pull request #289 from jhollinger/no_spaces
Sanitize pad names
2012-01-08 07:30:07 -08:00
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
TimWolla 12fc8226f0 Made pad.html more valid
- & -> &
- Removed duplicate ID in one Tag
2012-01-08 13:55:34 +01:00
Jordan ca70a7772a Fix cursor jump in IE when clicking edit buttons 2012-01-02 20:45:31 -05: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
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 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
0ip 4287cc283a Fix for disappearing chat 2011-12-07 15:14:52 +01: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
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