Commit Graph

936 Commits

Author SHA1 Message Date
Peter 'Pita' Martischka ada09f3e6b Added a jshint binary 2012-01-22 14:56:08 +01:00
Marcel Klehr 49061175c9 Text color changes based on author color 2012-01-22 13:30:25 +01:00
Robin c0a0687fe9 It was definetely too late 2012-01-22 13:09:10 +01:00
John McLear d881cefbc9 Merge pull request #347 from 0ip/patch-2
Typo again
2012-01-21 18:44:39 -08:00
0ip 3f8b03a900 Typo again 2012-01-22 02:15:02 +01:00
John McLear a1081d47ba Merge pull request #346 from 0ip/ua_dupl
Fix for UA-detection duplicates
2012-01-21 16:11:35 -08:00
Robin 3c85a9cc6c Typo 2012-01-22 00:13:00 +01:00
Robin 300886da34 Removed duplicates 2012-01-22 00:10:06 +01:00
Azul c4f9268cfa make PadMessageHandler more robust against timing issues 2012-01-19 17:38:16 +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
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