Commit Graph

338 Commits (b507f48a341517287eadffe066aa1b20ea761729)

Author SHA1 Message Date
Chad Weider af4bd5ca65 Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/js/pad.js`. 2012-02-27 23:14:49 -08:00
Peter 'Pita' Martischka 611cfbd6fa Merge pull request #468 from cweider/minify-simplify
Minify Simplification
2012-02-27 10:00:18 -08:00
Stefan 'Gared d2cd1213ec Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-27 15:22:15 +00:00
Peter 'Pita' Martischka 0c77052698 Fixed #299 and #338 2012-02-27 14:20:33 +01:00
Peter 'Pita' Martischka 973aad5c96 Fix doesPadExist check 2012-02-27 14:13:47 +01:00
Peter 'Pita' Martischka ed8aff22d4 restart abiword on crash and give the user feedback about bad import files 2012-02-27 00:22:53 +01:00
Stefan 'Gared 6706332e42 Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-26 19:52:09 +00:00
Peter 'Pita' Martischka 00c3281a02 Forbid colons, this Fixes #301 2012-02-26 19:59:02 +01:00
Peter 'Pita' Martischka c3f728b2ed Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller"
This reverts commit 9ede14a546.
2012-02-26 16:13:07 +01:00
0ip 1b339a6a6d Merge pull request #486 from fourplusone/fix_redirect
use relative path for redirects avoiding problems with reverse proxies
2012-02-25 11:05:26 -08:00
Matthias Bartelmeß 0191c248b5 Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix
Conflicts:
	static/js/ace2_inner.js
2012-02-24 20:22:32 +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