Commit Graph

1278 Commits (18dc111010075d4e47db371e38b5b10fc208d30b)

Author SHA1 Message Date
Matthias Bartelmeß 0191c248b5 Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix
Conflicts:
	static/js/ace2_inner.js
2012-02-24 20:22:32 +01:00
Egil Moeller ee40b23cfc Added a fake plugin __builtin__ for builtin functionality 2012-02-24 20:21:52 +01:00
Egil Moeller 441fd2f8eb Bugfix for there being no registrations for a hook at all 2012-02-24 20:21:22 +01:00
Egil Moeller 30b018833c Added a simple test plugin that doesn't do much 2012-02-24 20:03:58 +01:00
Egil Moeller 168f481980 Restructuring of some code to make it more readable 2012-02-24 19:02:56 +01:00
John McLear 64f04670ef Merge pull request #483 from fourplusone/ace2_inner_patch2
refactored ace_setProperty of ace2_inner.js
2012-02-24 09:00:18 -08:00
Egil Moeller 38e62274bc Added expressServer hook to register new URLs 2012-02-24 17:59:14 +01:00
John McLear 04126690fb Merge pull request #480 from fourplusone/ace2_inner_patch-1
fixed indention + variable scoping
2012-02-24 08:52:41 -08:00
Egil Moeller 1ea5954a3b Merge branch 'master' of github.com:redhog/etherpad-lite 2012-02-24 17:43:25 +01:00
Egil Moeller e5a46f5850 Added hook.callAll and hook.aCallAll 2012-02-24 17:37:40 +01:00
Egil Moeller e994b5b2b1 Oups, bad format 2012-02-24 15:33:20 +01:00
Egil Moeller b4b0026068 Added the basic parts for a plugin loader 2012-02-24 13:42:36 +01:00
John McLear 88744901c0 Fixes import major bug caused by removing container required for callback of import 2012-02-24 12:23:31 +00: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
Matthias Bartelmeß b06f3f6903 removed ";" 2012-02-21 23:15:19 +01:00
Matthias Bartelmeß 4ef71c3534 documented ace_setProperty 2012-02-21 23:13:59 +01:00
Matthias Bartelmeß eae87fd835 fixed indention + variable scoping 2012-02-21 21:46:25 +01:00
Jordan 6467a1a40f Document the -s|--settings cli option in README 2012-02-21 15:36:05 -05:00
Peter 'Pita' Martischka 481489e6e5 Merge pull request #478 from jhollinger/settings_option
Allow settings filename to be passed as a cli option
2012-02-21 12:16:14 -08:00
Jordan 8bac77ff80 Allow settings filename to be passed as a cli option 2012-02-21 14:20:45 -05:00
Peter 'Pita' Martischka 10cbb485fb Merge pull request #473 from drdla/patch-1
Promote proper use of css specificity
2012-02-21 02:45:08 -08:00
drdla ec2d415a92 Promote proper use of css specificity 2012-02-20 22:28:25 +01: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
John McLear d479784559 Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix 2012-02-20 01:11:34 +00:00
Matthias Bartelmeß b9130134c6 remove javascript lexer styles 2012-02-19 21:59:31 +01:00
0ip 0261ab653e Update static/css/pad.css 2012-02-19 20:10:10 +01:00
0ip fc0114fc2d added settings to mobile version 2012-02-19 17:51:10 +01:00