public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,153 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

378 Commits (8b5925440ad21d7e127c2fa4e80bd4ddb6965597)

Author SHA1 Message Date
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
Chad Weider 82652dffda Revert "Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/js/pad.js`." 
This reverts commit af4bd5ca65.
 2012-02-28 19:00:27 -08:00
Chad Weider 45b7cafca4 Don't let filenames be changed to Windows' backslash-notation. 2012-02-28 18:29:23 -08:00
Chad Weider 45ba5d60dc Windows does not like IP addresses of 0.0.0.0. 2012-02-28 18:13:10 -08:00
Chad Weider a7c009d0c9 Status code should not be assumed. 2012-02-28 18:09:33 -08:00
Chad Weider 118e7928b9 Headers should only be set after file is written. 2012-02-28 18:08:03 -08:00
Chad Weider 24a26953a7 Account for undefined argument. 2012-02-28 18:06:30 -08:00
Chad Weider 96ee77d85b Check error not stats. 2012-02-28 18:05:27 -08:00
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
Egil Moeller 1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
Egil Moeller 1955bdec9a plugins.plugins is now defined while loading hook modules from plugins 2012-02-26 00:59:05 +01:00
Egil Moeller 2a58a62dcc Client side / server side require 2012-02-26 00:45:06 +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
Egil Moeller ce35f20988 Make plugins dict non-recursive 2012-02-25 19:43:22 +01:00
Egil Moeller e542199aab Serve plugin static files 2012-02-25 19:43:00 +01:00
Egil Moeller 1d86c828bc Bugfix for plugin listing 2012-02-25 17:58:25 +01:00
Egil Moeller 7b42987407 Moved all the hooks into a hooks directory 2012-02-25 17:23:44 +01:00
Egil Moeller 6754eed9b4 Renamed functions to match hook names 2012-02-25 16:53:15 +01:00
Egil Moeller f2cfb4eee5 Removed some more junk 2012-02-25 16:50:11 +01:00
Egil Moeller cddf71f6fe Moved socketio 2012-02-25 16:44:37 +01:00
Egil Moeller db38a43fd7 Some code cleanup 2012-02-25 16:24:39 +01:00
Egil Moeller 6a6191f67e Moved errorhandling 2012-02-25 16:20:40 +01:00
Egil Moeller 24dda0c54d Moved importexport 2012-02-25 16:06:08 +01:00
Egil Moeller 1c0734e97b Better hook debug printout 2012-02-25 15:44:04 +01:00
Egil Moeller a5245c896a Moved apicalls 2012-02-25 15:20:31 +01:00
Egil Moeller fe7bed6501 Moved webaccess 2012-02-25 13:38:09 +01:00
Egil Moeller 26d9c3ed53 Better plugin error handling 2012-02-25 13:37:47 +01:00
Egil Moeller a89c81f62f Moved padreadonly 2012-02-25 00:15:57 +01:00
Egil Moeller 28babf0aa5 Moved minified 2012-02-24 23:55:19 +01:00
Egil Moeller 0730eb5b8d Bugfix for not loading plugins until after db, plus moved padursanitize into own module 2012-02-24 23:38:37 +01:00
Egil Moeller e3770e42b6 Moved /p/:pad and /p/:pad/timeslider static html to specialpages 2012-02-24 20:53:42 +01:00
Egil Moeller 752dc5ca26 Moved special pages ( /, /robots.txt, /favicon.ico ) to their own module 2012-02-24 20:50:55 +01:00
Egil Moeller 21300bd6c7 Moved static files serving to its own file 2012-02-24 20:45:02 +01:00
Egil Moeller 1f2b52ba5a Builtin 'plugin' now works 2012-02-24 20:29:14 +01: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
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 168f481980 Restructuring of some code to make it more readable 2012-02-24 19:02:56 +01:00
Egil Moeller 38e62274bc Added expressServer hook to register new URLs 2012-02-24 17:59:14 +01: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