Commit Graph

378 Commits (8b5925440ad21d7e127c2fa4e80bd4ddb6965597)

Author SHA1 Message Date
Egil Moeller b4b0026068 Added the basic parts for a plugin loader 2012-02-24 13:42:36 +01:00
Matthias Bartelmeß 9e82aab858 use relative path for redirects avoiding problems with reverse proxies 2012-02-23 20:35:41 +01:00
Stefan 'Gared 38d93eac39 fixed a spelling mistake 2012-02-23 16:01:21 +01:00
Jordan 8bac77ff80 Allow settings filename to be passed as a cli option 2012-02-21 14:20:45 -05:00
Chad Weider cfe095466f Add some comments. 2012-02-19 20:47:23 -08:00
Chad Weider 98f56b53b4 Use cache for minified assets. 2012-02-19 20:47:23 -08:00
Chad Weider 6a7a3ea3ab Provide a better last modified date for require-kernel. 2012-02-19 20:47:23 -08:00
Chad Weider 78691feec7 Drop all packaging logic from minify. 2012-02-19 20:47:23 -08:00
Chad Weider 3b2a3ad324 It is ok if the directory doesn't exist. 2012-02-19 20:47:23 -08:00
Chad Weider e0930005c3 Minify serves all static assets. 2012-02-19 20:47:23 -08:00
Chad Weider df9e29087f Only gzip text files.
It is not very productive to compress images so compress text only.
2012-02-19 20:47:17 -08:00
Chad Weider aac849f6ea Do not allow relative paths. 2012-02-19 20:43:17 -08:00
Chad Weider 494ca0560b Only add date if date exists. 2012-02-19 20:43:17 -08:00
Chad Weider ff264aa69a Combine existense and date checks. 2012-02-19 20:43:17 -08:00
Chad Weider a5006255b7 Last modification is more specific (when possible). 2012-02-19 20:43:17 -08:00
Chad Weider 3da1464ae0 Minify serves the require kernel. 2012-02-19 20:43:17 -08:00
Chad Weider e33c5a3aac Extract file existance check. 2012-02-19 20:43:17 -08:00
Chad Weider dcc0740621 Use Yajsml to combine files.
Minify only constructs individual files and optionally compresses them with UglifyJS.
2012-02-19 20:43:17 -08:00
Chad Weider b661ef5960 Inline response generation. 2012-02-19 20:43:17 -08:00
Chad Weider bb10f026ca Create CachingMiddleware for zipping and caching. 2012-02-19 20:43:17 -08:00
Chad Weider 43f4184e8d Minify specifies maxAge. 2012-02-19 20:43:17 -08:00
Chad Weider 1fe9d2a21e Allow maxAge of server to be specified in a setting. 2012-02-19 20:43:17 -08:00
Chad Weider a5365f2547 Support GET and HEAD. 2012-02-19 20:43:17 -08:00
Chad Weider a09e208b0a Return 404's. 2012-02-19 20:43:17 -08:00
Chad Weider c2669360d1 Catch 304's early. 2012-02-19 20:43:17 -08:00
Chad Weider d6d4178dbc Extract lastmodified from handler. 2012-02-19 20:43:17 -08:00
Chad Weider 2797c2fc5b Use the correct expression. 2012-02-19 20:43:17 -08:00
Matthias Bartelmeß 9ede14a546 drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller 2012-02-19 15:02:54 +01:00
Peter 'Pita' Martischka 0d9754760d Merge pull request #458 from fourplusone/master
Should fix #417 and #360
2012-02-17 03:21:26 -08:00
Matthias Bartelmeß fe6c5e1cfe restructured and commented fixes #417 and #360 in order to make code more intuitive 2012-02-17 11:41:41 +01:00
Matthias Bartelmeß 97b7f0707f Add further checks to make sure sessioninfos[sessionID] is !== undefined 2012-02-16 23:35:00 +01:00
Chad Weider 1063a3d036 Account for more spaces and Windows paths. This fixes #456. 2012-02-16 14:19:16 -08:00
Matthias Bartelmeß bad920e28d fixes #417 and #360 2012-02-16 23:11:52 +01:00
Chad Weider 546aaae379 Merge branch 'modulize-share' 2012-02-14 12:10:41 -08:00
Chad Weider 9837cda257 Correct typo in 363e168561. 2012-02-14 12:09:47 -08:00
Peter 'Pita' Martischka ebeb2da275 Merge pull request #422 from jhollinger/fix_listPads
HTTP API listPads should return an array
2012-02-14 09:22:18 -08:00
Chad Weider e0d23e3c5d Create and use the Security module.
Use it to replace code on the client and server side.
2012-02-10 14:52:35 -08:00
Chad Weider 363e168561 Share `randomString` method.
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
Chad Weider 7038f9a61d Drop the `cssmanager_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider f6ac0b1926 Drop the `linestylefilter_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 3581a45491 Drop the `domline_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 4098cbe03b Drop the `easysync*` modules. 2012-02-10 14:52:34 -08:00
Chad Weider f8f80968ca Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules. 2012-02-10 14:52:34 -08:00
Chad Weider 3dabe81989 Create a module to proxy client-side modules. 2012-02-10 14:52:34 -08:00
Jordan 5fde0b548c HTTP API listPads should return an array 2012-02-06 21:10:37 -05:00
Chad Weider 4bf9b0c805 Always include the require kernel. 2012-02-05 16:59:40 -08:00
Chad Weider 348e7ef1d5 Define packaging for iframe JS in the same way as pad.js and timeslider.js. 2012-02-05 16:59:40 -08:00
Chad Weider 458b5a4f03 Combine tar and isolate, so that everything is done in one definition. 2012-02-05 16:59:40 -08:00
Chad Weider ddc74cd0f1 Make the comment a part of the module. 2012-02-05 16:59:40 -08:00
Chad Weider ebb5055ce8 Extract file retrieval. 2012-02-05 16:59:40 -08:00
Chad Weider e68413d998 Extract Ace.js file generation. 2012-02-05 16:59:40 -08:00
Chad Weider f010f3ae9d Remove redundant line. 2012-02-05 13:59:34 -08:00
Robin 7075ff6731 get rid of vendor prefixes 2012-02-04 18:08:04 +01:00
Robin bb808d11ac remove jquery ui 2012-02-03 21:20:02 +01:00
booo 3f3bb95073 Revert "Optimize javascript minification, slight increase of file size, but massive performance improvement"
This reverts commit b32f883a9d.
2012-02-02 11:26:36 +01:00
Peter 'Pita' Martischka be1bd1d12d Merge pull request #381 from booo/master
remove joose as dependency
2012-01-31 05:51:55 -08:00
Peter 'Pita' Martischka b32f883a9d Optimize javascript minification, slight increase of file size, but massive performance improvement 2012-01-31 13:27:46 +01:00
booo 0c723c2686 remove joose dependency 2012-01-30 15:59:13 +01:00
Peter 'Pita' Martischka aeea061f69 Merge pull request #366 from booo/master
move randomString function into a module
2012-01-30 01:58:28 -08:00
Peter 'Pita' Martischka 4d714cee94 Merge pull request #371 from cweider/page-initialization
Page initialization
2012-01-30 01:56:02 -08:00
Chad Weider a408557a0e Make implicit loading of modules unnecessary.
This is one step on the way to simplifying `Minify` and allowing all of the modules within pad.js to be loaded independently in development mode (which is useful for debugging).
2012-01-28 23:11:54 -08:00
Jordan 01cacff008 Convert goToPad to middleware 2012-01-28 21:51:25 -05:00
Chad Weider 67e6f9fa5a Move timeslider code into JS. 2012-01-28 18:42:49 -08:00
Chad Weider 3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
booo a300bb6e92 move randomString function into module 2012-01-28 13:24:58 +01:00
Robin 57075d1545 Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug 2012-01-26 17:22:44 +01:00
booo 87b11045e1 fix issue #281? 2012-01-25 22:00:08 +01:00
Chad Weider 62e0a8f26c Use require-kernel for require functionality. 2012-01-22 09:54:28 -08:00
Chad Weider 71dfced06d Provide filename to isolation function. 2012-01-22 09:49:13 -08:00
Chad Weider 8bf0e7c2aa Allow dashes in included file names. 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 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
Peter 'Pita' Martischka cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:25:50 +01:00
Peter 'Pita' Martischka d391dab558 fixed merge conflict 2012-01-22 15:23:50 +01:00
Azul c4f9268cfa make PadMessageHandler more robust against timing issues 2012-01-19 17:38:16 +01:00
Peter 'Pita' Martischka a313c2570e Merge pull request #331 from cweider/packaging-improvement
Packaging improvement
2012-01-15 12:48:41 -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 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
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
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
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 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 609701961e Added some comments to help us documentating the code 2011-12-11 19:45:40 +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
Peter 'Pita' Martischka 6684d6ed52 replaced all stop callbacks with customError callbacks. Fixes #270 2011-12-10 16:46:47 +01:00
Peter 'Pita' Martischka 49006a3b6a Don't make the globalPads too global ;) 2011-12-08 23:32:51 +01:00