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
1519 commits 207 branches 105 tags 123 MiB
Commit graph

110 commits

Author SHA1 Message Date
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
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