summaryrefslogtreecommitdiff
path: root/src/static
AgeCommit message (Expand)Author
2016-06-13Merge pull request #2991 from LokeshN/deactivate-settingsJohn McLear
2016-05-22Issue #2960 - deactivate settings.jsonLokeshN
2016-05-20heh whoops :)John McLear
2016-05-20client Var value for disabling scriptsJohn McLear
2016-04-05Merge pull request #2940 from ether/extend-getAttributesOnSelectionJohn McLear
2016-03-26Merge pull request #2898 from rohieb/feature/more-uri-schemesJohn McLear
2016-03-26Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLineJohn McLear
2016-03-26forgot this oneJohn McLear
2016-03-26extend attributesonselection methodJohn McLear
2016-03-20Fix a possible xss attack in iframe linkStefan
2016-03-15Update author when removing line attribute from lineLuiza Pagliari
2016-02-14Merge pull request #2893 from bhldev/cssFontColorsStefan
2016-01-30Highlight and link more URI schemes: about, geo, telRoland Hieber
2016-01-22CSS Default Font Colors for Issue 2853Brian Lim
2016-01-20Timeslider Not Translated Issue 2885Brian Lim
2016-01-18Fix for 2844 and 2812Brian Lim
2016-01-17fix drop event on last charJohn McLear
2016-01-10more tidyJohn McLear
2016-01-10tidy upJohn McLear
2016-01-10Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-b...John McLear
2016-01-08removalJohn McLear
2016-01-08removalJohn McLear
2016-01-08hrm, removalJohn McLear
2016-01-08seems to workJohn McLear
2016-01-05Merge pull request #2871 from tiblu/pad_userlist_add_usersOnline_fix_bug_in_u...John McLear
2016-01-05Add usersOnline function to pad_userlist, fix a bug where several occurances ...Mikk Andresen
2015-12-31Fix handleClientMessage_USER_* payloads not containing user infoMikk Andresen
2015-12-23should be clean enough to pushJohn McLear
2015-12-17remove loggingChris Birk
2015-12-17check for soffice before removing export pathsChris Birk
2015-12-05include event on paste and drrororororopJohn McLear
2015-12-05remove con logJohn McLear
2015-12-05ace drop eventJohn McLear
2015-12-02Merge pull request #2850 from tiblu/aceEditorCSS_allow_external_cssJohn McLear
2015-12-01Merge pull request #2831 from fcassin/developJohn McLear
2015-12-01Update the bowser.js to the new versionjoassouza
2015-12-01aceEditorCSS to allow absolute paths to resources to include external CSSMikk Andresen
2015-11-10Protects against a null atext in cloneATextFrancois Cassin
2015-11-06paste hook and class for editorcontainerJohn McLear
2015-11-02Merge pull request #2820 from storytouch/fix_2818John McLear
2015-11-02Merge pull request #2822 from storytouch/escJohn McLear
2015-10-30Add callstack to aceSelectionChanged contextLuiza Pagliari
2015-10-29Allow plugins handle "esc" key eventjoassouza
2015-10-27Fix logic to check if any hook handled ACE key event. Fix #2818Luiza Pagliari
2015-10-22Merge pull request #2724 from xavidotron/developJohn McLear
2015-10-22Merge pull request #2739 from otetard/bugfix/fix_space_removalJohn McLear
2015-10-22Merge pull request #2748 from CodeMichael/developJohn McLear
2015-10-22Merge pull request #2805 from storytouch/indentationSettingJohn McLear
2015-10-22add classes for bootstrap targeting, pew pewJohn McLear
2015-10-13Create setting to control if a new line will be indented or notLuiza Pagliari