Commit Graph

810 Commits (72d29b1c627d54453fe48a89b063631fec8e6859)

Author SHA1 Message Date
Chad Weider 72d29b1c62 Inject the pad dependency into chat. 2012-01-22 09:49:13 -08:00
Chad Weider 8a0d6c6636 Add missing dependency for `timeslider.js`.
When dependencies are made explicity `pad_savedrevs.js` will be required by several of the `pad_*.js`.
2012-01-22 09:49:13 -08:00
Chad Weider da95016228 Add a fake `require` to go with the fake `exports`. 2012-01-22 09:49:13 -08:00
Chad Weider fc68a25b21 Isolate all files in a closure. 2012-01-22 09:49:13 -08:00
Chad Weider ab02135643 Factor out taring process. 2012-01-22 09:49:13 -08:00
Chad Weider 9e16b9a575 Always use the JS assets processed by Minify.
This allows the preprocessing that will restrict scope of files to be done once in Minify.
2012-01-22 09:49:13 -08:00
Chad Weider 2b5d7a0048 All files export their public interface if `exports` is available. 2012-01-22 09:48:21 -08:00
Chad Weider 003c2a59aa Remove dependency on a global socket and address `pad.socket` instead. 2012-01-22 09:46:09 -08:00
Chad Weider 6bbc32a19f Default plugin should not fail if clientVars is not defined.
In the case that it is not defined, the configuration is `undefined`.
2012-01-22 09:46:09 -08:00
Chad Weider 0f7e6feda1 Remove individual settings in `pad2.js` from global. 2012-01-22 09:46:09 -08:00
Chad Weider 50d304022d Change calculation of `userAgent`.
Default to 'node-js' only if no user agent can be found the normal way.
2012-01-22 09:46:09 -08:00
Chad Weider 548c527aaf Move exposure of `Ace2Editor` closer to the code that requires it. 2012-01-22 09:46:08 -08:00
Chad Weider b175ad562a Use uncompressed jQuery.
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
2012-01-22 09:46:08 -08:00
Chad Weider 53549b7422 Use constants and CWD-independent paths for resource directories. 2012-01-22 09:42:09 -08:00
Chad Weider c3acdbe329 Minify uses the stardard middleware interface. 2012-01-22 09:33:17 -08:00
Chad Weider 1c0a74d7c6 Use middleware to specify Server name in header. 2012-01-22 09:30:51 -08:00
John McLear 04d48e8592 Added a getting started developing Etherpad Lite video to readme.md.. 2012-01-22 16:29:51 +00:00
John McLear ca68196c32 Added a getting started developing Etherpad Lite video to readme.md 2012-01-22 16:24:06 +00:00
Peter 'Pita' Martischka cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:25:50 +01:00
Peter 'Pita' Martischka 165f26947d Merge pull request #341 from azul/race_condition
make PadMessageHandler more robust against timing issues
2012-01-22 06:25:35 -08:00
Peter 'Pita' Martischka cece2c858e Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:24:02 +01:00
Peter 'Pita' Martischka d391dab558 fixed merge conflict 2012-01-22 15:23:50 +01:00
Peter 'Pita' Martischka 6b19ffeaf6 Merge pull request #348 from 0ip/fixforfixforfix
Final fix for fix for fix (scope issues)
2012-01-22 06:22:46 -08:00
Peter 'Pita' Martischka e2a348057d Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 14:58:38 +01:00
booo 7720c312ca README: add notice about jshint 2012-01-22 21:57:44 +08:00
Peter 'Pita' Martischka ada09f3e6b Added a jshint binary 2012-01-22 14:56:08 +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