summaryrefslogtreecommitdiff
path: root/src/node/utils
AgeCommit message (Collapse)Author
2014-11-01blah push back for importsJohn McLear
2014-11-01use latest jsdomJohn McLear
2014-10-11Move `title` attribute of buttons from `<span>` to `<a>`Prateek Saxena
The `.toolbar ul li a` that holds the `span.button` has a padding of `4px 5px`. This means if the mouse is on the edge of the button the `:hover` state is active but the relevant tooltip does not show up. Moving the `title` attribute to the `<a>` itself solves this problem. Also removed some extra whitespace.
2014-07-24Update Settings.jsJoachim Schiele
added brackets to match etherpad lite devs' coding style
2014-06-22added /abs/path/settings.json handlingJoachim Schiele
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-17Merge pull request #1787 from goldquest/dev_nopass_whensessionMarcel Klehr
Grant access for valid session to password protected group pads so, if user has valid session, they don't need the password
2014-03-30Create a customizable timeslider toolbarMarcel Klehr
2014-03-16Refactor toolbar.js to use consistent namingMarcel Klehr
2014-03-16Merge branch 'pr/1579' into toolbar-testMarcel Klehr
Conflicts: settings.json.template src/static/js/pad_editbar.js
2014-01-24fix randomstringwebzwo0i
2014-01-15convert over to server-side cryptoRobert Helmer
2014-01-15new randomString function should take len argRobert Helmer
2014-01-15mozilla bug 844796 - use node crypto module for randomStringRobert Helmer
2013-12-16Merge pull request #1514 from ether/dont-die-on-bad-htmlJohn McLear
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-10Merge branch 'fix-exporthtml-styling-tags' of ↵John McLear
https://github.com/webzwo0i/etherpad-lite into develop
2013-12-09resolve merge conflictJohn McLear
2013-12-08[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this ↵webzwo0i
code was used for FF2 key handling code and is long unused
2013-12-08[padDiff] remove unused functions a?lines_lengthwebzwo0i
2013-12-08fix loopwebzwo0i
2013-12-08remove unused requirewebzwo0i
2013-12-08function scope: variables only need to be declared oncewebzwo0i
2013-12-08remove now unused codewebzwo0i
2013-12-08refactor export of style attributeswebzwo0i
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-08useless var statement (function scope)webzwo0i
2013-12-08workaround so that at least one tag stays open if its the outermost tag. ↵webzwo0i
saves some space in the output
2013-12-08be more clear about the value in propValswebzwo0i
2013-12-08some more docs for attribute export and cleanup empty lineswebzwo0i
2013-12-08add some documentation for styling attributes exportwebzwo0i
2013-12-08fix export so no tags are omittedwebzwo0i
2013-12-05Replace tabs indentation with spaces indentationLuc Didry
Some files are obviously external libraries, I didn't touch them
2013-11-26have the server parse the settings file using minify and strip commass1341
2013-10-19Privacy: Add an option to disable IP loggingGrant Woodford
2013-09-29Merge branch 'pr/1756' into developMarcel Klehr
Conflicts: src/node/handler/SocketIORouter.js
2013-09-29‘Etherpad Lite’ -> ‘Etherpad’Eric Schrijver
2013-09-21strip title out of html during import, pesky abiword behaviorJohn McLear
2013-09-21dont crash on malformed HTML importJohn McLear
2013-05-29typogoldquest
2013-05-29Grant access, when valid session is available and sessionNoPassword is setgoldquest
2013-04-24updated to use settingsSpruce (Felix Fichte)
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-15passing the ToolbarItem to the callbackcohitre
2013-04-15catch error on exportJohn McLear
2013-04-15Normalizing how select and button commands are triggered.cohitre
2013-04-13Moving the toolbar plugin calls.cohitre
2013-04-01Merge branch 'feature/support-node-0.10' into developMarcel Klehr
Conflicts: src/package.json
2013-03-30fix "util.pump() is deprecated. Use readableStream.pipe()"Manuel Knitza
fix error introduced by b3988e3 
2013-03-24adds missing semicolons in src/node/utils folderdisy-mk
2013-03-23pump isdeprecatedJohn McLear
2013-03-16Fix path.join in Settings.jsMarcel Klehr
2013-03-12Toolbar hookscohitre
2013-03-10Registering commands on the ace toolbarcohitre