summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-27allow greater than or equal to v 4John McLear
2016-03-26Merge pull request #2898 from rohieb/feature/more-uri-schemesJohn McLear
Highlight and link more URI schemes: about, geo, tel
2016-03-26Merge pull request #2924 from Gared/update_windows_buildJohn McLear
Update windows build
2016-03-26Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLineJohn McLear
Update author when removing line attribute from line
2016-03-26Merge pull request #2931 from Gared/improve_node_version_checkJohn McLear
Improve node version check
2016-03-26Merge pull request #2937 from Gared/fix_backend_test_errorJohn McLear
Fix check in backend tests
2016-03-24Localisation updates from https://translatewiki.net.Niklas Laxström
2016-03-23Fix check in backend testsStefan
2016-03-21Localisation updates from https://translatewiki.net.Niklas Laxström
2016-03-20Merge pull request #2932 from Gared/fix_xss_iframe_linkJohn McLear
Fix a possible xss attack in iframe link
2016-03-20Fix a possible xss attack in iframe linkStefan
2016-03-20Remove support for io.jsStefan
2016-03-20Check for node version 4 or higher and not special versionsStefan
2016-03-20Do not include absolute path in windows zipStefan
2016-03-17Localisation updates from https://translatewiki.net.Niklas Laxström
2016-03-15Update author when removing line attribute from lineLuiza Pagliari
This avoids raising error 'Trying to submit changes as another author in changeset' when 2 authors change line attributes of the same line. This fixes issue #2925.
2016-03-14Update windows build:Stefan
- Update node to version 4.4.0 - Create temp folder dynamically
2016-03-14Localisation updates from https://translatewiki.net.Niklas Laxström
2016-03-13Merge pull request #2889 from reedacartwright/reedacartwright-patch-1Stefan
Use exec to switch to node process
2016-03-09Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-02-19Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-02-14Merge pull request #2893 from bhldev/cssFontColorsStefan
Css default colors Issue #2853
2016-02-08Localisation updates from https://translatewiki.net.Niklas Laxström
2016-02-06Merge pull request #2890 from bhldev/languageTimesliderUrlParameterStefan
Timeslider Not Translated Issue 2885
2016-02-02Merge pull request #2862 from Gared/set_mysql_connection_charsetStefan
set charset for mysql connection in settings.json
2016-02-01Localisation updates from https://translatewiki.net.Niklas Laxström
2016-01-30Highlight and link more URI schemes: about, geo, telRoland Hieber
2016-01-25Localisation updates from https://translatewiki.net.Niklas Laxström
2016-01-23Merge pull request #2863 from gutobenn/padname-sizeStefan
Limit padname input field to 50 characters
2016-01-22CSS Default Font Colors for Issue 2853Brian Lim
2016-01-20Timeslider Not Translated Issue 2885Brian Lim
2016-01-19Merge pull request #2881 from luser/append-text-docsJohn McLear
Add appendText API (from #2810) to docs.
2016-01-19Merge pull request #2886 from bhldev/padOptionsLangJohn McLear
Set language cookie on initial load Issue #2882
2016-01-19Merge pull request #2887 from bhldev/editorListIndentOutdentJohn McLear
Editor List Fix for 2844 and 2812
2016-01-19Use exec to switch to node processReed A. Cartwright
At the end of run, `exec` should be used to switch to the node process. That way node will take over the pid of `sh run.sh`, making it easier to monitor and daemonize the server. ``` exec [command [arg ...]] Unless command is omitted, the shell process is replaced with the specified program (which must be a real program, not a shell built-in command or function). Any redirections on the exec com- mand are marked as permanent, so that they are not undone when the exec command finishes. ```
2016-01-18Fix for 2844 and 2812Brian Lim
2016-01-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-01-17Set language cookie on initial loadBrian Lim
2016-01-17fix drop event on last charJohn McLear
2016-01-13Add appendText API (from #2810) to docs.Ted Mielczarek
2016-01-11Localisation updates from https://translatewiki.net.Niklas Laxström
2016-01-10Merge pull request #2876 from ether/drag-and-drop-between-frames-sandboxJohn McLear
Drag and drop between frames
2016-01-10more tidyJohn McLear
2016-01-10tidy upJohn McLear
2016-01-10Merge branch 'develop' of github.com:ether/etherpad-lite into ↵John McLear
drag-and-drop-between-frames-sandbox
2016-01-08removalJohn McLear
2016-01-08herpJohn McLear
2016-01-08removalJohn McLear
2016-01-08hrm, removalJohn McLear
2016-01-08seems to workJohn McLear