summaryrefslogtreecommitdiff
path: root/src/static
AgeCommit message (Collapse)Author
2016-08-30Account for any top margin on the first line.Dan Bornstein
Without this change, a top margin on any element on the first line of pad content would throw off the alignment of line numbers. The default stylesheet doesn't define any elements with top margins, but plugins might. (This is also explained in a code comment.) In order to see the problem, add the following clause to `iframe_editor.css` (before incorporating this commit): #innerdocbody > :first-child { margin-top: 100px; }
2016-08-22Perform drag and drop in one changeset, so UNDO works properly. Fix #3041Luiza Pagliari
2016-07-21Fix #2918. Re-enable editor after user is reconnected to serverLuiza Pagliari
2016-06-28Merge pull request #2970 from xavidotron/urlJohn McLear
Remove [ and ] from the regexp used by the URL filter.
2016-06-20Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEventsJohn McLear
Create hook to register events that won't scroll editor after aceEditEvt
2016-06-13Merge pull request #2991 from LokeshN/deactivate-settingsJohn McLear
Issue #2960 - deactivate settings.json
2016-05-22Issue #2960 - deactivate settings.jsonLokeshN
Deactivate settings.json in Admin dashboard
2016-05-20heh whoops :)John McLear
2016-05-20client Var value for disabling scriptsJohn McLear
2016-05-06Remove [ and ] from the regexp used by the URL filter.Xavid
These characters are rarely used in URLs, and including them leads to mislinkifying when editing various formats, such as wiki markup formats that use [] around links.
2016-04-05Merge pull request #2940 from ether/extend-getAttributesOnSelectionJohn McLear
extend attributesonselection method
2016-03-30Create hook to register events that won't scroll editor after aceEditEvtLuiza Pagliari
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 #2926 from storytouch/addAuthorOnRemoveAttributeOnLineJohn McLear
Update author when removing line attribute from line
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
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-02-14Merge pull request #2893 from bhldev/cssFontColorsStefan
Css default colors Issue #2853
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 ↵John McLear
drag-and-drop-between-frames-sandbox
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 ↵John McLear
tiblu/pad_userlist_add_usersOnline_fix_bug_in_users pad_userlist.js: BUGFIX: users() returning duplicates on several calls. FEATURE: usersOnline() returns only online users
2016-01-05Add usersOnline function to pad_userlist, fix a bug where several occurances ↵Mikk Andresen
of current user were pushed to users list.
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
aceEditorCSS hook to allow absolute paths to resources to include external CSS
2015-12-01Merge pull request #2831 from fcassin/developJohn McLear
Protect against a null atext value in cloneAText
2015-12-01Update the bowser.js to the new versionjoassouza
With this new version of bowser.js is possible detect the OS as well, no only the browser as the previous one. It brings support to new browsers as well.
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
Fix logic to check if any hook handled ACE key event. Fix #2818
2015-11-02Merge pull request #2822 from storytouch/escJohn McLear
Allow plugins handle "esc" key event
2015-10-30Add callstack to aceSelectionChanged contextLuiza Pagliari
2015-10-29Allow plugins handle "esc" key eventjoassouza