libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7442 commits 2 branches 0 tags 24 MiB
Commit graph

7442 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter 'Pita' Martischka
cfb58a80a3 Merge git://github.com/Gared/etherpad-lite 2012-03-11 16:07:29 -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
Peter 'Pita' Martischka
a6d4858f09 Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite 2012-03-11 16:04:20 -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
Peter 'Pita' Martischka
935edbf892 fix dirty path in settings.json 2012-03-04 19:47:35 +01:00
Egil Moeller
f6b9b49ab4 Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually 2012-03-02 22:02:42 +01:00
Egil Moeller
ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
 2012-03-02 22:00:20 +01:00
Egil Moeller
6cd391d3fb Fixed timeslider which I broke a few minutes ago 2012-03-01 20:18:03 +01:00
Egil Moeller
df531a7b2b Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
Egil Moeller
81440cd856 Removed old pluginfw stuff 2012-03-01 19:00:58 +01:00
Egil Moeller
73aa0687b8 Client side hooks are now loaded and works 2012-03-01 18:45:02 +01:00