libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 22:49:53 +01:00
Code Issues Projects Releases Wiki Activity
4527 commits 207 branches 105 tags 123 MiB
Commit graph

851 commits

Author SHA1 Message Date
Mark Holmquist
3d4fb81796 Add in an HTTP API call to send a custom message type. 
You cannot currently send any data with your custom message, but
this patch is just begging for a second one that will allow that.
 2012-08-08 10:12:11 -07:00
Marcel Klehr
db54ab4b36 Merge pull request #887 from psifertex/develop 
adding basic numbered list support to dokuwiki export
 2012-08-01 12:36:04 -07:00
Marcel Klehr
de907cd0db Add loadSettings hook. 2012-07-25 10:58:30 +02:00
Chad Weider
cd11717b99 Eliminate the loopback that has been causing so much trouble. 
`localhost`, `0.0.0.0`, `127.0.0.1` each works only in some places some of the time, this works around the problem by overriding Yajsml's built-in request mechanism in favor of a hacked together one. TODO: Serve files from another service, or directly from the file system in order to make this unnecessary.

Fixes #747
 2012-07-22 23:55:07 -07:00
Uli Köhler
14582d1eba Escaped title using Security.escapeHTML() 2012-07-22 19:07:14 +02:00
Uli Köhler
8630de66bf Added missing newline after closing title tag 2012-07-22 18:37:38 +02:00
Uli Köhler
90357e0cdc Added <title> tag to make exported HTML valid 2012-07-21 21:19:44 +02:00
Jordan Wiens
c0daf1aaaf adding basic numbered list support to dokuwiki export 2012-07-19 00:59:15 -04:00
Matthias Bartelmeß
6b429b2ca1 Merge pull request #851 from marcelklehr/fix-settings.json 
Fix settings.json
 2012-07-17 10:27:18 -07:00
Marcel Klehr
ead379cf66 Merge pull request #853 from fourplusone/feature/async_handleMessage 
async handle message
 2012-07-12 03:50:37 -07:00
Marcel Klehr
dc09323d8f Don't exit if no settings file was found. 2012-07-11 15:36:41 +02:00
Marcel Klehr
f09dd0f3fb Put toString() back in. 2012-07-11 15:34:33 +02:00
Marcel Klehr
87f26334d1 Fix typo. 2012-07-10 21:55:35 +02:00
Marcel Klehr
8858446678 Exit on error. 2012-07-10 21:38:14 +02:00
Jordan Hollinger
a7dd620b9f Don't crash if setText isn't passed any text. issue #861 2012-07-10 00:53:55 -04:00
Matthias Bartelmeß
975171a86b Make handleMessage async 2012-07-08 21:06:19 +02:00
Marcel Klehr
4c8f69b7c5 Use v8 to parse settings.json 2012-07-08 18:59:46 +02:00
Marcel Klehr
af3c57a120 Load npm to enable server to see the git revision. 2012-07-08 11:37:24 +02:00
Jordan Hollinger
6d5fe459f0 Bugfix to getLastEdited API method, issue #845 2012-07-07 13:22:27 -04:00
John McLear
34fdfcb253 Merge pull request #840 from redhog/master 
Bugfix for readonly timeslider
 2012-07-05 10:34:55 -07:00
Egil Moeller
17b6103a3d Bugfix for broken readonly timeslider 2012-07-05 19:33:20 +02:00
John McLear
bc15ea5c15 Merge pull request #829 from marcelklehr/support-node-0.8 
Support node 0.8
 2012-07-05 09:54:25 -07:00
Marcel Klehr
c01aaeefc1 Allow node v0.6.x and 0.8.x 2012-07-05 17:34:23 +02:00
Egil Moeller
a0548af021 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver 2012-07-03 23:32:37 +02:00
Egil Moeller
b438a278a1 Make the server restart on plugin install 2012-07-03 23:31:44 +02:00
Mark Holmquist
91ed1f57c5 Don't rewrite in a stupid way 
Since we're already in the proper path for the pad, why worry
about it? Replacing the entire path of the URL with /p/padname may
have seemed like a good idea at the time, but really, for a 302 we
only need a relative pathname. This patch provides the proper way.
 2012-07-02 16:46:31 -07:00
Marcel Klehr
9d35b51500 Replace path.exists with fs.exists 2012-06-30 18:57:59 +02:00
Mark Holmquist
a71a8a7efc Add in padUsersCount method and API call 
The PadMessageHandler objects now have a new API call associated
with them. I'm sure that's a funny place to put it, but the
pad2sessions object in that file seems to be the only place user
counts are stored!

Anyway, I hope this is helpful. I know it would be for me :)
 2012-06-29 11:26:12 -07:00
John McLear
711dee8f6b Merge pull request #821 from marcelklehr/fix-contributor-api-methods 
Fix contributor api methods
 2012-06-27 12:12:41 -07:00
Marcel Klehr
93b50d4a29 Some fixes to the contributor API methods 
Mostly these are coding style adjustments
 2012-06-27 21:02:41 +02:00
John McLear
a717c11ab3 Merge pull request #819 from marcelklehr/contributor-api-methods 
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
 2012-06-27 11:31:25 -07:00
Mark Holmquist
ab0d3c87cb Add in getLastEdited API call 
This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
 2012-06-27 10:05:17 -07:00
Marcel Klehr
6f9d7a5db7 Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad 
Return all pads that a given author has contributed to (not just
created) and return all authors who has contributed to a given pad.
 2012-06-27 18:23:17 +02:00
John McLear
0bc01feb72 Merge pull request #818 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:09:14 -07:00
Mark Holmquist
c4e660b206 Fix glaring problem with pull request 
I accidentally forgot to call finalHandler if there was no padID
.... :)
 2012-06-26 16:07:08 -07:00
John McLear
3d9a2360be Merge pull request #817 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:01:40 -07:00
Mark Holmquist
79ca5f3e7c Refuse connection if the user is no longer authorized 
This should do the trick for issue 815. Please review and merge if
it works.

Try again: Fewer variables.
 2012-06-26 16:00:38 -07:00
Mark Holmquist
854e1092d9 Add in a new hook for handleMessage 
Add a new hook: handleMessage. Whenever a message comes in, it is
intercepted by this hook.
 2012-06-26 14:10:42 -07:00
John McLear
e4ff4021ab Merge pull request #810 from redhog/aceEditEvent 
Plugin/hook features&bugfixes
 2012-06-22 03:53:50 -07:00
Jordan Hollinger
6f37c0aaa6 The pad name sanitizer shouldn't drop query params. issue #779 2012-06-13 15:20:29 -04:00
Jordan Hollinger
486f7c904e Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768 2012-06-11 23:33:17 -04:00
Jordan Hollinger
d5faefdeae Bugfix to setPadHTML. resolves #764 2012-06-09 10:53:51 -04:00
Egil Moeller
cf2f0b72a3 More plugin information 2012-06-04 14:33:38 +02:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
 2012-05-29 21:26:12 +02:00
Chad Weider
a8340dfbbe Remove the libraries that are a part of ace2_common package. 2012-05-28 15:14:52 -07:00
John McLear
26614bf2d5 You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594 2012-05-23 01:01:50 +02:00
John McLear
d1c2d12150 Import Should now work in IE 2012-05-23 00:52:10 +02:00
John McLear
dafa44e6b4 I hate how hacky this change is. 2012-05-23 00:51:03 +02:00
John McLear
b27287ce37 Update src/node/handler/ImportHandler.js 2012-05-23 00:49:12 +02:00
John McLear
c8b93f6ddc Fix IE import 2012-05-23 00:46:56 +02:00
Matthias Bartelmeß
06c36f3023 fix #722 by better argument checking in PadMessageHandler.js 2012-05-22 09:31:28 +02:00
John McLear
ee11338927 Merge pull request #709 from cweider/packaging 
Packaging
 2012-05-17 04:59:24 -07:00
Edy
e8639d87ce fixes issue #707 
Don't set cached cookies
 2012-05-17 12:08:19 +02:00
Chad Weider
9b0e2287aa Add plugin framwork to common package. 2012-05-14 18:20:16 -07:00
Chad Weider
1a2c6425e1 Extract ace2_common into its own package. 2012-05-14 18:20:16 -07:00
John McLear
916e52a1eb Merge pull request #609 from prauscher/disable-passwords 
Disable passwords
 2012-05-13 06:55:47 -07:00
John McLear
c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code 
Removing unused code - All looks good, some minor tweeks are probably worthwhile  in the future.
 2012-05-13 06:51:58 -07:00
0ip
99ecadc0c3 Fix #655, wrong located APIKEY.txt 2012-05-13 00:34:26 +03:00
Egil Moeller
e559ef5640 Disable design mode in readonly pad 2012-04-23 16:41:41 +02:00
Egil Moeller
480d0b8e25 ReadOnly pad handling 2012-04-23 16:18:14 +02:00
Egil Moeller
e5a22423bb Fixed timedelta problem 2012-04-23 14:20:17 +02:00
Egil Moeller
583743a3f9 Restored saved revision support 2012-04-23 12:58:04 +02:00
Egil Moeller
914d79ad20 Unified timeslider and pad editing protocol / component 2012-04-23 12:52:30 +02:00
Matthias Bartelmeß
9d9b7b7b47 Merge branch 'develop' into feature/cleaner_code 2012-04-21 00:34:32 +02:00
Matthias Bartelmeß
8fefb551fc less verbose startup, better log messages at startup 2012-04-20 22:44:10 +02:00
Matthias Bartelmeß
7f50e8f551 server.js can be called from console. 2012-04-20 22:40:33 +02:00
Matthias Bartelmeß
c90ef5aeb8 default dirty.db to current pwd, so no new directory has to be created 2012-04-20 22:39:16 +02:00
Matthias Bartelmeß
e9fc16a974 warn if dirty db is used 2012-04-20 17:03:37 +02:00
Matthias Bartelmeß
90bbf169b2 allow startup without settings file 2012-04-20 17:03:26 +02:00
Matthias Bartelmeß
9691f02765 removing Minify.js.rej 2012-04-20 15:12:20 +02:00
Egil Moeller
9a67a3a1db Removed debug print 2012-04-20 15:08:50 +02:00
Egil Moeller
72c972b256 Bugfix for recursive dependency-installation and paths 2012-04-20 14:37:53 +02:00
Matthias Bartelmeß
23bbe4ab5a undo-xpopup seems to be unused 2012-04-20 12:04:10 +02:00
Egil Moeller
ecac40d062 Changed the authentication mechanism to support hooks 2012-04-19 16:04:03 +02:00
Egil Moeller
ac36a99a72 More general basic auth 2012-04-19 14:25:12 +02:00
Egil Moeller
4c1d94343f Better plugin admin interface 2012-04-18 13:43:34 +02:00
Matthias Bartelmeß
e664320b8c removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere 2012-04-15 19:25:23 +02:00
Jordan Hollinger
362ef454b8 Don't block static paths with http auth 2012-04-13 05:17:48 -04:00
John McLear
18038ddd50 Merge pull request #614 from fourplusone/ace2_refactoring 
Adding more hooks + some code refactoring
 2012-04-08 17:28:47 -07:00
Matthias Bartelmeß
b7a0b36b5e ...well stupid error 2012-04-08 21:21:30 +02:00
Patrick Rauscher
867cc94806 bugfix for some crashes through stack overflows 2012-04-08 17:48:30 +00:00
Patrick Rauscher
0e7cb78ec2 Allow disabling Passwords by setting them to an empty string 2012-04-07 13:41:00 +00:00
Patrick Rauscher
6da38fd8bc bugfix to use the API again 2012-04-07 13:40:02 +00:00
Matthias Bartelmeß
0340c87996 Pad message handler detects lineattributemakers by asking Attribute manager 2012-04-07 01:05:25 +02:00
Matthias Bartelmeß
d61cdf57cc Merge branch 'develop' into ace2_refactoring 2012-04-05 22:28:16 +02:00
johnyma22
d3cc8e3374 Make the console show the url that admin/plugins is available at 2012-04-05 17:49:03 +01:00
Matthias Bartelmeß
1b383dc9b8 Merge branch 'develop' into ace2_refactoring 2012-04-05 00:51:18 +02:00
Matthias Bartelmeß
23cda77b65 added AttributeManager, ChangesetUtils 2012-04-05 00:50:04 +02:00
Matthias Bartelmeß
137e06d52b Merge branch 'develop' into fix/max-age 2012-04-04 17:42:08 +02:00
Matthias Bartelmeß
5c4551b098 remove maxAge: undefined header, send maxAge even if set to 0 2012-04-04 17:41:03 +02:00
Matthias Bartelmeß
f34e13f761 on plugin definitions, only expose plugins with client_hooks registered. dont expose 'package' property 2012-04-04 15:10:27 +02:00
Matthias Bartelmeß
7fbcffb30b fix crash if getFileCompressed fails (i.e. if /static/js is called) 2012-04-03 20:42:02 +02:00
Matthias Bartelmeß
396b586dbd when no password is set, dont allow access to admin page 2012-04-03 14:17:19 +02:00
John McLear
9ecd864ac6 Merge pull request #557 from redhog/master 
Templating system built on top of EJS and plugin installer
 2012-04-02 12:42:38 -07:00
Egil Moeller
e06bf0e991 Basic auth for admin page 2012-04-02 18:45:37 +02:00
Egil Moeller
434252a321 Removed prefixfree as it breaks @import in css files 2012-04-01 22:55:04 +02:00
Egil Moeller
33c53e61c2 Merge branch 'johnyma22' 
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
 2012-04-01 13:27:38 +02:00
John McLear
bc76913a6d fix pitas fix 2012-03-31 18:16:31 +01:00
Egil Moeller
6120a0b7aa Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-03-27 22:36:48 +02:00
Matthias Bartelmeß
daca484747 Merge branch 'develop' into objectify_ep 
Conflicts:
	src/node/utils/tar.json
	src/static/js/ace2_inner.js
 2012-03-27 11:15:48 +02:00
John McLear
beec69ac1c Merge pull request #556 from fourplusone/feature_jquery 
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
 2012-03-26 08:10:58 -07:00
Matthias Bartelmeß
8bf481f27b Send the Content-Type header for plugin-definitions.json in the right format 2012-03-24 13:28:17 +01:00
Matthias Bartelmeß
cf1be9b4bf added underscore to tar.json 2012-03-23 20:22:49 +01:00
Matthias Bartelmeß
c407ad3d34 re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-23 19:28:46 +01:00
Egil Moeller
b8a4333d1b Exposed require to ejs pages! 2012-03-22 18:34:38 +01:00
Egil Moeller
37c0d279c1 Bugfix for when a block hook calls eejs.require recursively 2012-03-21 19:27:06 +01:00
Egil Moeller
c591efb352 Plugin list can now be reloaded 'live' 2012-03-19 17:16:49 +01:00
Matthias Bartelmeß
8eb43a3ebf replaceing AttributePoolFactory by AttributePool 2012-03-18 09:05:46 +01:00
Egil Moeller
af96509fbb Plugin install/uninstall 2012-03-17 18:17:10 +01:00
Matthias Bartelmeß
692e77b4e5 Merge branch 'feature_jquery' into use_natives 
Conflicts:
	src/static/js/ace2_inner.js
	src/static/js/pluginfw/plugins.js
 2012-03-16 18:50:32 +01:00
Egil Moeller
81250cba15 Searching for plugins, plus handling async events from the server (progress) 2012-03-15 21:07:48 +01:00
Egil Moeller
51cae02e9d Show installed plugins and search new ones 2012-03-15 18:25:06 +01:00
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
Matthias Bartelmeß
1cf3ffef4a added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner 2012-03-14 01:41:05 +01:00
Matthias Bartelmeß
ede32726c1 check if sockets are available in PadMessageHandler 2012-03-14 01:32:16 +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
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
Chad Weider
0944670fb7 Merge remote-tracking branch 'main/master' into develop 2012-03-11 15:58:36 -07: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
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
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
ee312672d3 This is duplicated by the contents of static. 2012-03-10 14:39:37 -08: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
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
Peter 'Pita' Martischka
8b5925440a Fix configuration of express 2012-03-04 21:23:05 +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
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
Egil Moeller
35626df77b Send plugin data to client 2012-02-29 16:05:44 +01:00
Egil Moeller
c9797a3714 Bugfix for dependency data circle 2012-02-29 16:05:25 +01:00
Egil Moeller
a894fcd4f9 Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
Egil Moeller
0a4a7f538d Merge branch 'temo' 2012-02-26 22:02:02 +01:00
Egil Moeller
2c7b84ca3e Minify now supports plugins 2012-02-26 22:01:52 +01:00
Egil Moeller
763361a7c9 First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
Egil Moeller
fd5b7c1080 require(ep_pluginname/static/blabla); now works both on client and server 2012-02-26 15:34:03 +01:00
Egil Moeller
ac7ad6b519 Bugfix for git version extraction code 2012-02-26 14:14:54 +01:00
Egil Moeller
da52353ba3 The big rename of pluginbs from pluginomatic to ep 2012-02-26 13:54:32 +01:00
Egil Moeller
1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00