Joachim Schiele
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02:00
Marcel Klehr
b1b972a2b4
Merge pull request #1787 from goldquest/dev_nopass_whensession
...
Grant access for valid session to password protected group pads
so, if user has valid session, they don't need the password
2014-06-17 14:01:16 +02:00
Marcel Klehr
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
Marcel Klehr
da5970dda3
Refactor toolbar.js to use consistent naming
2014-03-16 15:14:21 +01:00
Marcel Klehr
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
webzwo0i
a43123880a
fix randomstring
2014-01-24 01:19:14 +01:00
Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f
new randomString function should take len arg
2014-01-15 11:44:41 -08:00
Robert Helmer
9ef709e7f7
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 10:58:50 -08:00
John McLear
7d47d91a08
Merge pull request #1514 from ether/dont-die-on-bad-html
...
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-16 03:08:42 -08:00
John McLear
58cd71dcce
Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop
2013-12-10 19:25:36 +00:00
John McLear
58bbfd8a65
resolve merge conflict
2013-12-09 21:55:04 +00:00
webzwo0i
9400425b1e
[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused
2013-12-08 17:33:58 +01:00
webzwo0i
ca6f877db2
[padDiff] remove unused functions a?lines_length
2013-12-08 17:28:43 +01:00
webzwo0i
e1fbb1d1aa
fix loop
2013-12-08 13:53:26 +01:00
webzwo0i
9557dc9dba
remove unused require
2013-12-08 13:48:21 +01:00
webzwo0i
c3081c046b
function scope: variables only need to be declared once
2013-12-08 13:47:05 +01:00
webzwo0i
0fa0d6dc2c
remove now unused code
2013-12-08 13:45:45 +01:00
webzwo0i
27e0c37779
refactor export of style attributes
...
1. mark all attributes that are used
2. find the outermost attribute that is no longer used
3. close all tags upto this attribute
4. open all tags that are used and not open
(5. close all open tags)
2013-12-08 13:39:50 +01:00
webzwo0i
f968b5a057
useless var statement (function scope)
2013-12-08 11:37:47 +01:00
webzwo0i
51769585a9
workaround so that at least one tag stays open if its the outermost tag. saves some space in the output
2013-12-08 11:37:07 +01:00
webzwo0i
656a558af9
be more clear about the value in propVals
2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22
some more docs for attribute export and cleanup empty lines
2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b
add some documentation for styling attributes export
2013-12-08 11:33:20 +01:00
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
