summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-05-11Merge pull request #2657 from simong/cookie-parserJohn McLear
2015-05-10always hide connected one second after connectedJohn McLear
2015-05-07Merge pull request #2656 from stefanmintert/20150507-innertext-bugfixJohn McLear
2015-05-07Use the cookie parser middlewareSimon Gaeremynck
2015-05-07Merge pull request #2621 from ether/fix-dead-keysJohn McLear
2015-05-07Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dea...John McLear
2015-05-07support for french stuffJohn McLear
2015-05-07Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blo...Stefan Mintert
2015-05-06Merge pull request #2649 from xavidotron/developJohn McLear
2015-05-06Fix backend tests with new setText() implementation; tests dependedXavid
2015-05-06Merge pull request #2650 from ether/iframe-issuesJohn McLear
2015-05-06console msg should go to windowJohn McLear
2015-05-06fix alt c and escapeJohn McLear
2015-05-05Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-05-05fixes #2570John McLear
2015-05-05When using setText(), replace the entire existing text of the pad,Xavid
2015-05-04Merge pull request #2647 from 0ip/fix/awkward-cssJohn McLear
2015-05-04Fix popup border0ip
2015-05-04Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-05-01better fix for #2625John McLear
2015-04-29plugins always return html so use that endpointJohn McLear
2015-04-29dont prompt twice on import foolJohn McLear
2015-04-29Merge pull request #2643 from AlexanderS/fix-timeslider-exportJohn McLear
2015-04-29timeslider: Fix export linksAlexander Sulfrian
2015-04-28Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-28show versions of plugins at startup, fixes #2642John McLear
2015-04-28Merge pull request #2641 from lpagliari/developJohn McLear
2015-04-28allow chrome to use control shift 1 to send ordered listJohn McLear
2015-04-28Fix the way Content Collector gets the node class. Fixes #2640Luiza Pagliari
2015-04-26cleaner update logic doesnt error when nothing to doJohn McLear
2015-04-24fixes #2547John McLear
2015-04-24provide a script that cleans up before running to save people doing rm rf src...John McLear
2015-04-23probably fixes #2625John McLear
2015-04-23fix docsJohn McLear
2015-04-22Merge pull request #2636 from andreassolberg/developJohn McLear
2015-04-22Adding support for providing intermediate CA certificates when running etherp...Andreas Åkre Solberg
2015-04-17first attempt at fixing dead keys, it cant be this easy can it?John McLear
2015-04-17Update hooks_server-side.mdJohn McLear
2015-04-16Merge pull request #2619 from ether/masterStefan
2015-04-16Merge new release into master branch!Stefan
2015-04-16Release version 1.5.6Stefan
2015-04-16Merge pull request #2618 from Gared/win_node_versionJohn McLear
2015-04-16Update node version for windows build to 0.12.2Stefan
2015-04-15Merge pull request #2617 from devoidfury/fix/windows-issue-2614John McLear
2015-04-15revert to old path handling, but strip out "..". fixes #2614Tom Hunkapiller
2015-04-15Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-15remove two pointless dep removesJohn McLear
2015-04-15Update README.mdJohn McLear
2015-04-13Merge pull request #2611 from ether/masterStefan
2015-04-13Merge new release into master branch!Stefan
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:36:27 +0000