summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-01-06Update DB.jsJohn 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
2016-01-03Update package.jsonJohn McLear
2015-12-31Fix handleClientMessage_USER_* payloads not containing user infoMikk Andresen
2015-12-29Localisation updates from https://translatewiki.net.Niklas Laxström
2015-12-21include req and res in export convert hookJohn McLear
2015-12-21licenseJohn McLear
2015-12-21Merge pull request #2859 from cmbirk/developJohn McLear
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-18Use new exportAvailable() check to include check for SOffice along with Abiwo...Chris Birk
2015-12-17remove loggingChris Birk
2015-12-17check for soffice before removing export pathsChris Birk
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 00:25:46 +0000