summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-01-28hrm bit of a hack, anyone any ideas on better way?John McLear
2015-01-27better variable nameJohn McLear
2015-01-27Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-27change to cc..John McLear
2015-01-27content collector should also register the blocks, no idea why this wasnt in ↵John McLear
before
2015-01-26Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-01-26bump vJohn McLear
2015-01-26Merge pull request #2497 from ether/image-support-hookJohn McLear
clean support for image hook
2015-01-26even cleanerJohn McLear
2015-01-26much cleanerJohn McLear
2015-01-26clean support for image hookJohn McLear
2015-01-25Revert 'asyncLineHTMLForExport' hookStefan
2015-01-25tell installer if old etherpad needs updating during plugin installJohn McLear
2015-01-25Merge pull request #2487 from ether/html-e-hookJohn McLear
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
2015-01-24fix issue with load of showuserandchatJohn McLear
2015-01-24boopJohn McLear
2015-01-24Merge pull request #2490 from Gared/https_plugins_jsonJohn McLear
Use https to download plugins.json
2015-01-24Merge pull request #2488 from webzwo0i/fix-session-without-auth-crashJohn McLear
Stop processing a message without auth (i.e. a client did not send
2015-01-24Use https to download plugins.jsonStefan
2015-01-24Add 'last update' column to plugins tableStefan
2015-01-24Stop processing a message without auth (i.e. a client did not sendwebzwo0i
CLIENT_READY)
2015-01-24working, might need polish its pretty lateJohn McLear
2015-01-24realization how aCallAll worksJohn McLear
2015-01-24beginning of a hook, needs docs etcJohn McLear
2015-01-21include lineContent in hokJohn McLear
2015-01-21stylingJohn McLear
2015-01-21move saved revs notification to gritterJohn McLear
2015-01-21working translationJohn McLear
2015-01-21working logicJohn McLear
2015-01-21stylingJohn McLear
2015-01-21url paramJohn McLear
2015-01-21Merge pull request #2467 from ether/chat-and-usersJohn McLear
Show users and Chat at the same time
2015-01-21expose modernIE valueJohn McLear
2015-01-21try againJohn McLear
2015-01-21rename back to browserJohn McLear
2015-01-21bump ueberdbJohn McLear
2015-01-21workingJohn McLear
2015-01-21mheh looks fixedJohn McLear
2015-01-21working with a big hackJohn McLear
2015-01-21some sanityJohn McLear
2015-01-21blind attempt to tryJohn McLear
2015-01-21better logic for author handlingJohn McLear
2015-01-21restrict expor4t to only expose this pad IDJohn McLear
2015-01-20freeze depsJohn McLear
2015-01-19Merge pull request #2469 from ether/new-sethtml-testsJohn McLear
I need to do some more work on this at some point.. Leaving here
2015-01-19temp bodge fixJohn McLear
2015-01-19hrmJohn McLear
2015-01-19Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-19fix ie editingJohn McLear
2015-01-19Merge pull request #2470 from cetra3/timeslider_proxy_fixJohn McLear
Timeslider proxy fix