mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 18:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
3884 commits 215 branches 107 tags 73 MiB
Commit graph

197 commits

Author SHA1 Message Date
webzwo0i
86791707cd fix export so no tags are omitted 2013-12-08 11:31:23 +01:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
s1341
9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00
Grant Woodford
fbe4e43c3d Privacy: Add an option to disable IP logging 2013-10-19 21:37:11 +02:00
Marcel Klehr
7b17bd58ae Merge branch 'pr/1756' into develop 
Conflicts:
	src/node/handler/SocketIORouter.js
 2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d ‘Etherpad Lite’ -> ‘Etherpad’ 2013-09-29 13:57:37 +02:00
John McLear
4bea3a348e strip title out of html during import, pesky abiword behavior 2013-09-21 23:29:32 +01:00
John McLear
204118eea5 dont crash on malformed HTML import 2013-09-21 16:11:56 +01:00
goldquest
7528ddf610 typo 2013-05-29 16:54:39 +02:00
goldquest
121c02c74f Grant access, when valid session is available and sessionNoPassword is set 2013-05-29 16:53:14 +02:00
Spruce (Felix Fichte)
fb0bc31056 updated to use settings 
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
 2013-04-24 12:19:41 +02:00
cohitre
602380abb7 passing the ToolbarItem to the callback 2013-04-15 16:06:32 -07:00
John McLear
f987299a5d catch error on export 2013-04-15 23:01:08 +01:00
cohitre
0c52fb5e30 Normalizing how select and button commands are triggered. 2013-04-15 11:32:59 -07:00
cohitre
90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07:00
Marcel Klehr
04a53c4402 Merge branch 'feature/support-node-0.10' into develop 
Conflicts:
	src/package.json
 2013-04-01 13:29:07 +02:00
Manuel Knitza
358b07390e fix "util.pump() is deprecated. Use readableStream.pipe()" 
fix error introduced by b3988e3
 2013-03-30 15:42:10 +01:00
disy-mk
c78aad16ea adds missing semicolons in src/node/utils folder 2013-03-24 01:18:44 +01:00
John McLear
b3988e30d5 pump isdeprecated 2013-03-23 17:55:34 +00:00
Marcel Klehr
cd9c78998e Fix path.join in Settings.js 2013-03-16 09:47:10 +01:00
cohitre
988653b8ce Toolbar hooks 2013-03-12 19:36:04 -07:00
cohitre
52aa7d3997 Registering commands on the ace toolbar 2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7 Setting up the right toolbar. 2013-03-09 14:57:42 -08:00
cohitre
c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -08:00
Marcel Klehr
c4966543ed Fix settings object having constructors of another vm.context 
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
 2013-02-28 16:16:26 +01:00
John McLear
18b6cf1534 Merge pull request #1523 from ether/store-sessions-in-db 
Store sessions in db
 2013-02-26 18:03:54 -08:00
John McLear
7f09ec25a2 no need for prefix and tidy double semi 2013-02-13 21:53:15 +00:00
John McLear
efce99c3a1 session key in settings file OR generate temp key for instance 2013-02-13 21:51:09 +00:00
John McLear
aefd8d8d0d nice chars n no cruft 2013-02-13 18:45:45 +00:00
John McLear
dea892213e Revert "allow non ascii chars in txt export" 
This reverts commit be56272e66.
 2013-02-13 18:41:04 +00:00
John McLear
be56272e66 allow non ascii chars in txt export 2013-02-13 18:30:55 +00:00
John McLear
d3f730e2ba fix various issues dont stop random *'s appearing 2013-02-13 18:01:15 +00:00
John McLear
198110eb4b drunk comments 2013-02-12 23:49:43 +00:00
John McLear
e152c477c7 include the callback call, for sanity and stop the pad from being nuked so early in the function 2013-02-12 23:38:02 +00:00
John McLear
086132de66 dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad 2013-02-12 23:23:44 +00:00
John McLear
da246d183d Correct license header 2013-02-12 19:47:53 +00:00
John McLear
0b5c948549 Move code from Html export to a Helper file 2013-02-12 19:45:46 +00:00
John McLear
60ef5f210a remove duplicate code to the best of my ability right now 2013-02-10 23:41:14 +00:00
John McLear
bcf9c23b4e dont use HTML filter hooks on txt export 2013-02-10 19:38:16 +00:00
John McLear
626ee97669 kinda brutal way of stopping plugins being able to pass *s instead of attributes 2013-02-10 19:36:46 +00:00
John McLear
a67a0950dd stop urls being encoded, not sure about other security implications here... 2013-02-10 19:21:27 +00:00
John McLear
a378f48c00 remove console warns 2013-02-10 17:39:02 +00:00
John McLear
d16b15f3eb begin support for better txt output 2013-02-10 17:34:34 +00:00
John McLear
2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00:00
Peter 'Pita' Martischka
878fd7631c Fixed HTML export 2013-01-27 17:25:50 +00:00
Peter 'Pita' Martischka
07a267be7a Added colors to pad diff 2013-01-27 16:45:09 +00:00
John McLear
f1b9c213ee and semi working 2013-01-22 23:37:53 +00:00
John McLear
3fb2f02875 semi working 2013-01-22 23:16:49 +00:00
John McLear
d21585b880 mheh 2013-01-22 23:06:52 +00:00
John McLear
205d983225 make it crash 2013-01-22 22:48:05 +00:00