Commit Graph

971 Commits

Author SHA1 Message Date
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
John McLear d392083db3 Merge pull request #334 from 0ip/patch-1
Fixed dokuwiki "bug"
2012-01-15 09:57:32 -08:00
0ip 1767e0f6e8 Update static/css/pad.css 2012-01-15 18:55:33 +01:00
John McLear 5b807b4d86 Merge pull request #333 from 0ip/iconfix
Added icon for ordered lists
2012-01-15 09:43:27 -08: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
Chad Weider 77804673d7 Move packaging info into its own file. 2012-01-15 01:52:58 -08:00
Peter 'Pita' Martischka c45932c6b8 Merge pull request #329 from cweider/security
Security [HTML Escaping]
2012-01-14 15:22:12 -08:00
John McLear ba180452e7 Merge pull request #328 from 0ip/widthfix
Addition for 720px phones (forgot index.html)
2012-01-14 15:02:04 -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
Peter 'Pita' Martischka 8c0e1d7def Merge pull request #325 from 0ip/iconcleanup
Icon cleanup
2012-01-14 07:11:54 -08: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
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