summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-11-26regex incoming colorsJohn McLear
2015-11-24Merge pull request #2840 from ether/applySettingsJohn McLear
allow settings to be applied from the filesystem
2015-11-24clean upJohn McLear
2015-11-24allow settings to be applied from the filesystemJohn McLear
2015-11-24Merge pull request #2839 from Blake-jne/faster-migrationJohn McLear
Improve DB migration performance.
2015-11-21Improve DB migration performance.Blake Tölva
Achieve 10x speedup in migrating a 12mb dirtyDB file by disabling ueberDB caching in this special case. Add some progress messages to the migration script and rename it, as nothing in it is tied to mysql.
2015-11-06paste hook and class for editorcontainerJohn McLear
2015-11-05Merge pull request #2828 from Komasa/developStefan
Update installDeps.sh to support node v5
2015-11-04Update installDeps.shKomasa
2015-11-03Merge pull request #2827 from storytouch/exportHtmlAdditionalTagsWithDataLuiza Pagliari
Create hook exportHtmlAdditionalTagsWithData
2015-11-03Create hook exportHtmlAdditionalTagsWithDataLuiza Pagliari
The new hook does the same as exportHtmlAdditionalTags, but is declared in another hook to avoid confusion about how to export tags when they are stored as ['tag', 'value'] on attribute pool. This complements #2762, as per @Gared suggestions.
2015-11-02Merge pull request #2819 from bradarv90/developJohn McLear
Fix for #2809
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-30Merge pull request #2823 from storytouch/developLuiza Pagliari
Add callstack to aceSelectionChanged context
2015-10-30Add callstack to aceSelectionChanged contextLuiza Pagliari
2015-10-29Allow plugins handle "esc" key eventjoassouza
2015-10-28Fix for #2809Bradley Arvin
2015-10-27Fix logic to check if any hook handled ACE key event. Fix #2818Luiza Pagliari
Instead of checking if only the first hook had returned true, we check all hooks.
2015-10-26Merge pull request #2817 from storytouch/fix_tests_2805Luiza Pagliari
Fix flaky tests introduced by #2805
2015-10-24Fix flaky tests introduced by #2805Luiza Pagliari
2015-10-22Update installOnWindows.batJohn McLear
2015-10-22Merge pull request #2724 from xavidotron/developJohn McLear
Add a aceSelectionChanged hook to allow plugins to react when the cursor moves
2015-10-22Merge pull request #2739 from otetard/bugfix/fix_space_removalJohn McLear
Avoid space removal when pasting text from word processor.
2015-10-22Merge pull request #2748 from CodeMichael/developJohn McLear
allow /admin to run in a subdirectory
2015-10-22Merge pull request #2797 from ypid/rebuild-better-errorJohn McLear
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-22Merge pull request #2798 from ypid/fixed_get_git_hashJohn McLear
Get git commit hash even if the repo only points to a bare repo.
2015-10-22Merge pull request #2805 from storytouch/indentationSettingJohn McLear
Create setting to control if a new line will be indented or not
2015-10-22Merge pull request #2813 from simong/export-libreofficeJohn McLear
Allow LibreOffice to be used when exporting a pad
2015-10-22Merge pull request #2808 from lukeroge/patch-1John McLear
Pedantic Space
2015-10-22Merge pull request #2810 from luser/append-textJohn McLear
Add an appendText API
2015-10-22Use `Etherpad` rather than `Etherpad Lite` when exporting HTMLSimon Gaeremynck
2015-10-22Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-10-22add classes for bootstrap targeting, pew pewJohn McLear
2015-10-20Allow LibreOffice to be used when exporting a padSimon Gaeremynck
This commit adds support for LibreOffice when exporting a pad to doc, pdf, .. This commit also cleans up some export logic when exporting to txt
2015-10-19Add an appendText APITed Mielczarek
2015-10-17Merge pull request #2762 from storytouch/exportTagsAsArraysStefan
Accepting Arrays on 'exportHtmlAdditionalTags'
2015-10-15Pedantic SpaceLuke Rogers
<3
2015-10-14Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-10-13Create setting to control if a new line will be indented or notLuiza Pagliari
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{' automaticaly indents the new line with 4 spaces. The variable added by this commit to settings.json allow an Etherpad instance to not have this behavior.
2015-10-10Merge pull request #2730 from emilyxxie/clientready_hookStefan
added clientReady hook
2015-10-10Merge pull request #2799 from Gared/fix_url_location_errorStefan
Fix decode error if pad name contains special characters and is sanitized
2015-10-10Merge pull request #2787 from Gared/support_node_4Stefan
Support version 4 of node.js
2015-10-09Merge pull request #2801 from webzwo0i/fix-issue-2796webzwo0i
Fix pull request 2796
2015-10-09if granularity is negative, endNum is negative and loopwebzwo0i
2015-10-09check if ChangesetRequest granularity is a number (#2796)webzwo0i
2015-10-08Fix decode error if pad name contains special characters and is sanitizedStefan
2015-10-07Get git commit hash even if the repo only points to a bare repo.Robin Schneider
* Used by https://github.com/debops/ansible-etherpad
2015-10-07Give better error message when rebuildPad.js hits a non-existing rev.Robin Schneider