summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-12-21Merge pull request #2860 from tiblu/documentation_add_postToolbarInit_and_usa...John McLear
2015-12-18Add postToolbarInit documentation and usage examplesMikk Andresen
2015-12-07bump socketioJohn McLear
2015-12-05include event on paste and drrororororopJohn McLear
2015-12-05remove con logJohn McLear
2015-12-05ace drop eventJohn McLear
2015-12-02whoopsJohn McLear
2015-12-02Merge pull request #2851 from ether/plugin-hook-for-settings-earlierJohn McLear
2015-12-02working logicJohn McLear
2015-12-02Merge branch 'develop' of github.com:ether/etherpad-lite into plugin-hook-for...John McLear
2015-12-02remove applySettings hook and allow credentials.json to be part of coreJohn McLear
2015-12-02Merge pull request #2850 from tiblu/aceEditorCSS_allow_external_cssJohn McLear
2015-12-02Update aceEditorCSS hook documentationMikk Andresen
2015-12-01Merge pull request #2831 from fcassin/developJohn McLear
2015-12-01Merge pull request #2848 from storytouch/developJohn McLear
2015-12-01Merge pull request #2849 from ether/exportConvert-hookJohn McLear
2015-12-01 remove unused variableJohn McLear
2015-12-01Hook for export ocnvert controlJohn 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-26regex incoming colorsJohn McLear
2015-11-24Merge pull request #2840 from ether/applySettingsJohn McLear
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
2015-11-21Improve DB migration performance.Blake Tölva
2015-11-10Protects against a null atext in cloneATextFrancois Cassin
2015-11-10Merge pull request #1 from ether/developfcassin
2015-11-06paste hook and class for editorcontainerJohn McLear
2015-11-05Merge pull request #2828 from Komasa/developStefan
2015-11-04Update installDeps.shKomasa
2015-11-03Merge pull request #2827 from storytouch/exportHtmlAdditionalTagsWithDataLuiza Pagliari
2015-11-03Create hook exportHtmlAdditionalTagsWithDataLuiza Pagliari
2015-11-02Merge pull request #2819 from bradarv90/developJohn McLear
2015-11-02Merge pull request #2820 from storytouch/fix_2818John McLear
2015-11-02Merge pull request #2822 from storytouch/escJohn McLear
2015-10-30Merge pull request #2823 from storytouch/developLuiza Pagliari
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
2015-10-26Merge pull request #2817 from storytouch/fix_tests_2805Luiza Pagliari
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
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 #2797 from ypid/rebuild-better-errorJohn McLear
2015-10-22Merge pull request #2798 from ypid/fixed_get_git_hashJohn McLear
2015-10-22Merge pull request #2805 from storytouch/indentationSettingJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:47:46 +0000