Commit graph

  • 54da9fad73 Merge pull request #466 from fourplusone/cleanup-ace John McLear 2012-02-25 01:34:51 -08:00
  • a89c81f62f Moved padreadonly Egil Moeller 2012-02-25 00:15:57 +01:00
  • fed805be82 Reindentation of pluginomatic.json Egil Moeller 2012-02-24 23:56:54 +01:00
  • 28babf0aa5 Moved minified Egil Moeller 2012-02-24 23:55:19 +01:00
  • 0730eb5b8d Bugfix for not loading plugins until after db, plus moved padursanitize into own module Egil Moeller 2012-02-24 23:38:37 +01:00
  • e3770e42b6 Moved /p/:pad and /p/:pad/timeslider static html to specialpages Egil Moeller 2012-02-24 20:53:42 +01:00
  • 752dc5ca26 Moved special pages ( /, /robots.txt, /favicon.ico ) to their own module Egil Moeller 2012-02-24 20:50:55 +01:00
  • 21300bd6c7 Moved static files serving to its own file Egil Moeller 2012-02-24 20:45:02 +01:00
  • 1f2b52ba5a Builtin 'plugin' now works Egil Moeller 2012-02-24 20:29:14 +01:00
  • a9ed587cf9 Merge 0191c248b5 into 64f04670ef GitHub Merge Button 2012-02-24 11:23:19 -08:00
  • 0191c248b5 Merge commit '64f04670ef' into cleanup-ace-fix Matthias Bartelmeß 2012-02-24 20:22:32 +01:00
  • ee40b23cfc Added a fake plugin __builtin__ for builtin functionality Egil Moeller 2012-02-24 20:21:52 +01:00
  • 441fd2f8eb Bugfix for there being no registrations for a hook at all Egil Moeller 2012-02-24 20:21:22 +01:00
  • 30b018833c Added a simple test plugin that doesn't do much Egil Moeller 2012-02-24 20:03:58 +01:00
  • 168f481980 Restructuring of some code to make it more readable Egil Moeller 2012-02-24 19:02:56 +01:00
  • 8282903240 Merge 7e2929e36c into 64f04670ef GitHub Merge Button 2012-02-24 09:00:21 -08:00
  • 64f04670ef Merge pull request #483 from fourplusone/ace2_inner_patch2 John McLear 2012-02-24 09:00:18 -08:00
  • 38e62274bc Added expressServer hook to register new URLs Egil Moeller 2012-02-24 17:59:14 +01:00
  • f9ca237d28 Merge b06f3f6903 into 04126690fb GitHub Merge Button 2012-02-24 08:52:46 -08:00
  • 04126690fb Merge pull request #480 from fourplusone/ace2_inner_patch-1 John McLear 2012-02-24 08:52:41 -08:00
  • 1ea5954a3b Merge branch 'master' of github.com:redhog/etherpad-lite Egil Moeller 2012-02-24 17:43:25 +01:00
  • e5a46f5850 Added hook.callAll and hook.aCallAll Egil Moeller 2012-02-24 17:37:40 +01:00
  • e994b5b2b1 Oups, bad format Egil Moeller 2012-02-24 15:33:20 +01:00
  • b4b0026068 Added the basic parts for a plugin loader Egil Moeller 2012-02-24 13:42:36 +01:00
  • d056f70789 Merge eae87fd835 into 88744901c0 GitHub Merge Button 2012-02-24 04:22:42 -08:00
  • 88744901c0 Fixes import major bug caused by removing container required for callback of import John McLear 2012-02-24 12:23:31 +00:00
  • 9e82aab858 use relative path for redirects avoiding problems with reverse proxies Matthias Bartelmeß 2012-02-23 20:33:01 +01:00
  • 38d93eac39 fixed a spelling mistake Stefan 'Gared 2012-02-23 15:59:20 +01:00
  • b06f3f6903 removed ";" Matthias Bartelmeß 2012-02-21 23:15:19 +01:00
  • 4ef71c3534 documented ace_setProperty Matthias Bartelmeß 2012-02-21 22:29:40 +01:00
  • eae87fd835 fixed indention + variable scoping Matthias Bartelmeß 2012-02-21 21:46:25 +01:00
  • 6467a1a40f Document the -s|--settings cli option in README Jordan 2012-02-21 15:36:05 -05:00
  • 481489e6e5 Merge pull request #478 from jhollinger/settings_option Peter 'Pita' Martischka 2012-02-21 12:16:14 -08:00
  • 10670e1a89 Merge 8bac77ff80 into 10cbb485fb GitHub Merge Button 2012-02-21 11:27:49 -08:00
  • 8bac77ff80 Allow settings filename to be passed as a cli option Jordan 2012-02-21 14:20:45 -05:00
  • e561436b60 Merge f409914ff2 into 10cbb485fb GitHub Merge Button 2012-02-21 02:45:10 -08:00
  • 2674f9a6f6 Merge 74325b7b86 into 10cbb485fb GitHub Merge Button 2012-02-21 02:45:09 -08:00
  • 10cbb485fb Merge pull request #473 from drdla/patch-1 Peter 'Pita' Martischka 2012-02-21 02:45:08 -08:00
  • 65ec8a1b47 UI refactoring and code clean-up Dominik Rodler 2012-02-20 23:16:25 +01:00
  • 7e2929e36c Ace2Editor.EMBEDED Matthias Bartelmeß 2012-02-19 15:02:54 +01:00
  • cfd3b69ad2 Merge ec2d415a92 into d479784559 GitHub Merge Button 2012-02-20 13:29:52 -08:00
  • ec2d415a92 Promote proper use of css specificity drdla 2012-02-20 22:28:25 +01:00
  • cfe095466f Add some comments. Chad Weider 2012-02-19 18:26:31 -08:00
  • 98f56b53b4 Use cache for minified assets. Chad Weider 2012-02-19 18:37:31 -08:00
  • 6a7a3ea3ab Provide a better last modified date for require-kernel. Chad Weider 2012-02-19 18:31:46 -08:00
  • 78691feec7 Drop all packaging logic from minify. Chad Weider 2012-02-14 13:14:22 -08:00
  • 3b2a3ad324 It is ok if the directory doesn't exist. Chad Weider 2012-02-19 19:46:09 -08:00
  • e0930005c3 Minify serves all static assets. Chad Weider 2012-02-14 13:23:53 -08:00
  • df9e29087f Only gzip text files. Chad Weider 2012-02-19 20:11:52 -08:00
  • aac849f6ea Do not allow relative paths. Chad Weider 2012-02-14 18:14:07 -08:00
  • 494ca0560b Only add date if date exists. Chad Weider 2012-02-19 17:37:11 -08:00
  • ff264aa69a Combine existense and date checks. Chad Weider 2012-02-19 17:34:43 -08:00
  • a5006255b7 Last modification is more specific (when possible). Chad Weider 2012-02-05 15:01:51 -08:00
  • 3da1464ae0 Minify serves the require kernel. Chad Weider 2012-02-05 14:54:20 -08:00
  • e33c5a3aac Extract file existance check. Chad Weider 2012-02-06 23:05:50 -08:00
  • dcc0740621 Use Yajsml to combine files. Chad Weider 2012-01-29 03:30:31 -08:00
  • b661ef5960 Inline response generation. Chad Weider 2012-01-31 00:57:50 -08:00
  • bb10f026ca Create CachingMiddleware for zipping and caching. Chad Weider 2012-01-29 00:42:54 -08:00
  • 43f4184e8d Minify specifies maxAge. Chad Weider 2012-02-11 16:03:44 -08:00
  • 1fe9d2a21e Allow maxAge of server to be specified in a setting. Chad Weider 2012-02-06 23:04:02 -08:00
  • a5365f2547 Support GET and HEAD. Chad Weider 2012-01-29 12:57:49 -08:00
  • a09e208b0a Return 404's. Chad Weider 2012-01-29 12:54:12 -08:00
  • c2669360d1 Catch 304's early. Chad Weider 2012-01-29 00:00:11 -08:00
  • d6d4178dbc Extract lastmodified from handler. Chad Weider 2012-01-22 17:19:46 -08:00
  • 2797c2fc5b Use the correct expression. Chad Weider 2012-02-11 20:53:24 -08:00
  • d479784559 Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix John McLear 2012-02-20 01:11:34 +00:00
  • b9130134c6 remove javascript lexer styles Matthias Bartelmeß 2012-02-19 21:59:31 +01:00
  • 0261ab653e Update static/css/pad.css 0ip 2012-02-19 20:10:10 +01:00
  • fc0114fc2d added settings to mobile version 0ip 2012-02-19 17:51:10 +01:00
  • 12298a926c move width-specific css to bottom + transfer js-css to a class [#chatbox:.stickyChat] 0ip 2012-02-19 17:16:05 +01:00
  • 255cf8c5f0 qr codes now have equal margins 0ip 2012-02-19 17:04:36 +01:00
  • a540bff652 more robust index page + fix for iOS Safari rotation-bug 0ip 2012-02-19 17:00:43 +01:00
  • f9ad9bec92 clean up broadcast.js Matthias Bartelmeß 2012-02-19 16:05:07 +01:00
  • 465f6c2de7 use shared functions from Ace2Common Matthias Bartelmeß 2012-02-19 15:47:20 +01:00
  • 9ede14a546 drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller Matthias Bartelmeß 2012-02-19 15:02:54 +01:00
  • 7e7646b517 make jshint a bit more happier Matthias Bartelmeß 2012-02-19 14:52:24 +01:00
  • ce8d60e32c remamed to Ace2Inner() and made it more classlike Matthias Bartelmeß 2012-02-19 14:30:57 +01:00
  • 3c4b4af43d removed recolor module since it wasn't used Matthias Bartelmeß 2012-02-19 14:30:08 +01:00
  • fb879576e1 replaced noop in skiplist with ace2common implementation Matthias Bartelmeß 2012-02-19 14:28:51 +01:00
  • 5d14fb372a Merge branch 'cleanup-ace-js' into cleanup-ace Matthias Bartelmeß 2012-02-19 14:19:54 +01:00
  • 5313053d2d even more compact code for exposed functions in ace2.js Matthias Bartelmeß 2012-02-19 14:18:52 +01:00
  • a66e01a08f moving noop and identity helper functions to ace2_common Matthias Bartelmeß 2012-02-19 14:11:32 +01:00
  • 77dbe4646e binarySearch is never used Matthias Bartelmeß 2012-02-19 12:40:13 +01:00
  • 3cd7bd0dd1 Since ace2_inner.js is already scoped by require-kernel, function OUTER is pretty useless Matthias Bartelmeß 2012-02-19 12:34:24 +01:00
  • 99fb567a3d removed parenModule as it is entirely unused since getCharType() always returns an emtpy string Matthias Bartelmeß 2012-02-19 12:15:42 +01:00
  • 8031c31bc3 more compact code for exposed functions in ace2.js Matthias Bartelmeß 2012-02-19 03:16:42 +01:00
  • 7d643f911f Merge 1caaff9308 into 6ba865521a GitHub Merge Button 2012-02-18 09:51:42 -08:00
  • 6ba865521a See 1caaff9308 https://github.com/Pita/etherpad-lite/pull/462 John McLear 2012-02-18 17:51:39 +00:00
  • 1caaff9308 fix for issue 461 : pad.js : use decodeURIComponent(userName) - instead of unescape(userName) - to allow UTF-8 encoded parameter username Wikinaut 2012-02-18 14:35:28 +01:00
  • b775e06c53 Merge remote branch 'upstream/master' into nice-pad-url Wikinaut 2012-02-18 14:31:19 +01:00
  • 0d9754760d Merge pull request #458 from fourplusone/master Peter 'Pita' Martischka 2012-02-17 03:21:26 -08:00
  • 51ce7d238a Merge fe6c5e1cfe into 2bc07204f8 GitHub Merge Button 2012-02-17 02:41:50 -08:00
  • fe6c5e1cfe restructured and commented fixes #417 and #360 in order to make code more intuitive Matthias Bartelmeß 2012-02-17 11:40:29 +01:00
  • f409914ff2 Remove optimist dependency. Add help text with options Jordan 2012-02-16 18:26:06 -05:00
  • 97b7f0707f Add further checks to make sure sessioninfos[sessionID] is !== undefined Matthias Bartelmeß 2012-02-16 23:35:00 +01:00
  • 2bc07204f8 Merge pull request #459 from cweider/fix-common-code Chad Weider 2012-02-16 14:21:51 -08:00
  • ec617aa859 Merge 1063a3d036 into 9ca914f8cd GitHub Merge Button 2012-02-16 14:21:01 -08:00
  • 1063a3d036 Account for more spaces and Windows paths. This fixes #456. Chad Weider 2012-02-16 14:15:24 -08:00
  • bad920e28d fixes #417 and #360 Matthias Bartelmeß 2012-02-16 23:11:52 +01:00
  • 102318497d Allow settings to be specified with short '-s' option Jordan 2012-02-16 08:54:53 -05:00