fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,199 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

1199 Commits

Author SHA1 Message Date
Egil Moeller dbdc53307e Bugfix to not have server required anywhere as it causes problems for command line script usage of modules 2012-03-14 18:50:13 +01:00
Egil Moeller a5366a0a16 Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu 2012-03-13 20:32:56 +01:00
Egil Moeller 05c2e0fde5 Made all html pages into eejs templates 2012-03-13 18:24:45 +01:00
Egil Moeller 5f7f382a9e Merge branch 'master' into eejs 2012-03-13 17:51:42 +01:00
Egil Moeller 3ffed70850 Added inherit function 2012-03-13 17:42:15 +01:00
Egil Moeller 6fb0e00f03 Bugfixes for eejs 2012-03-13 17:31:40 +01:00
Egil Moeller 8756165ece Added a plugin-readme 2012-03-13 17:08:57 +01:00
Egil Moeller 381e64a801 Merge remote-tracking branch 'remotes/pita/develop' into pita-plugins 
Conflicts:
	src/node/utils/caching_middleware.js
 2012-03-13 17:08:38 +01:00
Peter 'Pita' Martischka cccd8a923c Merge git://github.com/Gared/etherpad-lite into develop 2012-03-11 16:07:34 -07:00
Peter 'Pita' Martischka f125af001f Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-03-11 16:06:16 -07:00
Peter 'Pita' Martischka 0b4ec7e1ad Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite into develop 2012-03-11 16:04:26 -07:00
Chad Weider 0944670fb7 Merge remote-tracking branch 'main/master' into develop 2012-03-11 15:58:36 -07:00
Chad Weider 6fe4034e7c Merge pull request #541 from cweider/fix-minify 
Fix minify
 2012-03-11 15:55:37 -07:00
Chad Weider 667df3f838 Merge pull request #540 from cweider/fix-timeslider 
Patch use of `forEach` after method was removed.
 2012-03-11 15:55:06 -07:00
Chad Weider d594b2db34 Merge branch 'require-paths' into plugin 
Conflicts:
	src/static/timeslider.html
 2012-03-10 18:27:21 -08:00
Chad Weider 65ad9da155 Correct resource paths. 2012-03-10 18:19:40 -08:00
Chad Weider 5ee0067d00 Merge branch 'plugin-fix-require' into plugin 2012-03-10 18:11:06 -08:00
Chad Weider 3a115154e7 Migrate tar to use library paths. 2012-03-10 17:16:50 -08:00
Chad Weider 4e039d68da Correct indentation. 2012-03-10 15:57:46 -08:00
Chad Weider 6fac0750c2 These definitions have no need to be inside this closure. 2012-03-10 15:57:46 -08:00
Chad Weider c1a903e32e Correct ca91c0c403. 2012-03-10 15:57:46 -08:00
Chad Weider c0fc7f9b0c Avoid orphaned cache files from breaking the caching layer. 
(cherry picked from commit 57d0a2e803)
 2012-03-10 15:27:17 -08:00
Chad Weider ca91c0c403 Correct cache location and guard against bad directories. 2012-03-10 15:27:09 -08:00
Chad Weider ddda347f7a Merge branch 'require-paths' into plugin 
Conflicts:
	node/server.js
	src/static/js/Changeset.js
	src/static/js/ace.js
	src/static/js/ace2_common.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/changesettracker.js
	src/static/js/chat.js
	src/static/js/collab_client.js
	src/static/js/contentcollector.js
	src/static/js/domline.js
	src/static/js/linestylefilter.js
	src/static/js/pad.js
	src/static/js/pad_connectionstatus.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_editor.js
	src/static/js/pad_impexp.js
	src/static/js/pad_modals.js
	src/static/js/pad_savedrevs.js
	src/static/js/pad_userlist.js
	src/static/js/pad_utils.js
	src/static/js/timeslider.js
	src/static/js/undomodule.js
	src/static/pad.html
	src/static/timeslider.html
 2012-03-10 15:08:09 -08:00
Chad Weider 86d6dde42f Rename javascript path from 'minified' to 'javascripts/src'. 
Also anticipate requirement of libary modules for plugins.
 2012-03-10 14:54:38 -08:00
Chad Weider 7b497b1522 Merge branch 'plugin-fix-require' into plugin 2012-03-10 14:40:28 -08:00
Chad Weider 0d6ec8c04a Minify implements virtual plugins resources. 2012-03-10 14:39:37 -08:00
Chad Weider 1a1f222221 Change paths. 2012-03-10 14:39:37 -08:00
Chad Weider c6b8beabd3 Correct paths to reflect their being libraries. 2012-03-10 14:39:37 -08:00
Chad Weider ca02ca05ae Remove unnecessary line. 2012-03-10 14:39:37 -08:00
Chad Weider 2fd9019792 Remove require code that is unnecessary and/or incorrect. 2012-03-10 14:39:37 -08:00
Chad Weider 648603126b Remove require changes in `pushScriptsTo` method. 
These duplicate `pushRequireScriptTo` at least, but mostly break things.
 2012-03-10 14:39:37 -08:00
Chad Weider ee312672d3 This is duplicated by the contents of static. 2012-03-10 14:39:37 -08:00
Chad Weider 652fffe8ea Upgrade require-kernel for relative path fixes. 2012-03-10 12:09:27 -08:00
Chad Weider 6af869cadd Modules requires use relative paths. 2012-03-10 12:09:27 -08:00
bradh 8619cd5784 Update README.md 2012-03-10 17:23:05 +11:00
Egil Moeller 384d768610 One more bug in cache dir setting 2012-03-08 21:47:18 +01:00
Egil Moeller 72571e5ef0 Bugfixing cache 2012-03-08 21:03:22 +01:00
Egil Moeller f6212f452c Bugfix 2012-03-08 21:01:01 +01:00
Egil Moeller 92dc3e59d6 First attempt to implement the block system from django templates on top of the npm module ejs. 2012-03-07 17:36:11 +01:00
Chad Weider 29548244fd Do not cache 404 responses. 
This makes DOS attacks way to easy. This really needs to be replaced with an LRU (e.g. a prebuilt middleware).
 2012-03-04 15:14:09 -08:00
Chad Weider 0930b64c4e Handle Windows paths correctly (again). 2012-03-04 15:07:00 -08:00
Chad Weider 57d0a2e803 Avoid orphaned cache files from breaking the caching layer. 2012-03-04 15:07:00 -08:00
Peter 'Pita' Martischka 7b518eeb2d Fixing client side require, the minify code is completly unused now, very ugly solution 2012-03-04 23:45:33 +01:00
Chad Weider 45af962a6a Patch use of `forEach` after method was removed. 
Corrects 465f6c2de7.
 2012-03-04 13:12:36 -08:00
Peter 'Pita' Martischka 8b5925440a Fix configuration of express 2012-03-04 21:23:05 +01:00
Peter 'Pita' Martischka 0e110efe9e fix debugRun 2012-03-04 21:06:37 +01:00
Peter 'Pita' Martischka 9f03e5ec68 Output nicer exceptions in hook call 2012-03-04 20:32:57 +01:00
Peter 'Pita' Martischka 5396cd68db Fix dirty path for windows 2012-03-04 19:50:52 +01:00
Peter 'Pita' Martischka 4e78a6b9cc Fix gitignore for custom files 2012-03-04 19:50:05 +01:00