fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,549 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

3549 Commits

Author SHA1 Message Date
Mike DeRosa 4ccd7131d3 Added function to switch to a different pad without having to reload the whole page. 2014-06-14 14:25:56 -04:00
Marcel Klehr 71c7deecd9 Merge pull request #2175 from ether/fix-handleMessage 
Pluginfw: Interpret hook return value `null` as  `[null]` instead of `undefined`

see http://etherpad.org/doc/v1.4.0/#index_return_values
fixes dropping of messages in handleMessage
 2014-06-12 14:59:46 +02:00
luto f70309645c pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage 2014-06-12 13:33:17 +02:00
Marcel Klehr cd294c608b Merge pull request #2149 from ether/dont-use-abiword-for-html 
abiword shouldnt be used for HTML native documents
 2014-06-11 14:47:33 +02:00
Marcel Klehr 7bec297c0a Merge pull request #2161 from ether/bump-ueber 
bump ueberdb for more performance on mysql
 2014-06-11 14:40:54 +02:00
Marcel Klehr 40a97f08bb Merge pull request #2169 from stephan48/develop 
Added documentation for the newly added API method getPadID
 2014-06-02 20:31:37 +02:00
Stephan Jauernick bbd50dfc62 Added documentation for the newly added API method getPadID 2014-06-02 20:25:16 +02:00
Marcel Klehr 1f40e05270 Merge pull request #2165 from stephan48/develop 
Added an API method for retrieving the padID from the readonlyID
 2014-06-02 16:53:25 +00:00
John McLear 0bc98a6b60 Merge pull request #2166 from divergentdave/patch-1 
Fix typos in easysync-full-description.tex
 2014-06-02 10:22:24 +01:00
David Cook 49114d2b7a Fix typos in easysync-full-description.tex 2014-06-01 23:57:20 -05:00
Stephan Jauernick fc3ce3429e Corrected the API Version number. 2014-06-01 21:21:08 +02:00
Stephan Jauernick 412bdd1857 Renamed the variable to prevent possible problems. 2014-06-01 21:19:15 +02:00
Stephan Jauernick d42a9eb3a6 Enhanced the Example for the API Method getPadID and make the return value consistent to other functions 2014-05-31 11:53:44 +02:00
Stephan Jauernick fffdde0c59 Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1 2014-05-31 00:43:31 +02:00
Stephan Jauernick 493636ec36 Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8 2014-05-31 00:39:36 +02:00
John McLear 37f6dde365 bump ueberdb for more performance on mysql 2014-05-21 13:20:39 +01:00
John McLear 44b1ac2b16 Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash 
Fix getRevisionChangeset API call making etherpad crash
 2014-05-14 14:10:44 +01:00
Siebrand Mazeland 9212ebe9f0 Localisation updates from https://translatewiki.net. 2014-05-12 13:42:45 +00:00
John McLear b74c43889e Update ImportHandler.js 2014-05-09 13:50:00 +01:00
Siebrand Mazeland 32898dec80 Localisation updates from https://translatewiki.net. 2014-05-08 08:40:43 +00:00
John McLear 6d38b05623 abiword shouldnt be used for HTML native documents 2014-05-06 17:32:45 +01:00
Marcel Klehr e85d09400e Merge pull request #2138 from ether/fix-user-icon-color-and-count 
Fix showusers button: Show authorcolor and user_count again
 2014-05-03 13:32:22 +02:00
Marcel Klehr 46ef83d710 Fix #online_count 
Rather dirty, but works.
 2014-04-30 22:32:08 +02:00
Siebrand Mazeland 20c32de5e7 Localisation updates from https://translatewiki.net. 2014-04-21 09:23:10 +00:00
John McLear 706ee1f866 fix color 2014-04-15 18:11:41 +01:00
Siebrand Mazeland 962b166c3a Localisation updates from https://translatewiki.net. 2014-04-14 13:49:59 +00:00
Siebrand Mazeland 6597c287e2 Localisation updates from https://translatewiki.net. 2014-04-06 17:03:18 +00:00
Siebrand Mazeland 156200d0fd Localisation updates from https://translatewiki.net. 2014-03-31 21:29:38 +00:00
John McLear 31c45bc9b8 Merge pull request #2126 from ether/fix/toolbar-timeslider-button 
Toolbar: Fix timeslider button
 2014-03-31 19:51:03 +01:00
Marcel Klehr 6b5e3ea3a5 Toolbar: Fix timeslider button 
Wouldn't play nice with url params in document.location
fixes #2124
 2014-03-31 20:50:01 +02:00
Marcel Klehr 991f0f8c26 Merge pull request #2123 from ether/master 
Update README.md
 2014-03-31 20:47:11 +02:00
Stefan c3a6a2374c Update README.md 
Added support for node v0.11 in the installation description
 2014-03-31 02:05:52 +02:00
Marcel Klehr 874181ce3b Merge branch 'master' into develop 2014-03-30 15:12:47 +02:00
Marcel Klehr c6d13a965c Merge branch 'release/1.4.0' 2014-03-30 15:11:50 +02:00
Marcel Klehr a7671a690b docs: update api version 2014-03-30 15:10:29 +02:00
John McLear de3a60ee2a Merge pull request #2120 from ether/fix/timeslider-editbar 
Add a customizable toolbar for timeslider
 2014-03-30 12:25:07 +01:00
Marcel Klehr 33ecc1d8df Update docs 2014-03-30 13:08:26 +02:00
Marcel Klehr 80e45e1192 Fix redo toolbar command, again. 2014-03-30 13:05:51 +02:00
Marcel Klehr 6054cda473 Create a customizable timeslider toolbar 2014-03-30 13:02:41 +02:00
Marcel Klehr 867e40533a Fix timeslider export dropdown 2014-03-30 12:30:18 +02:00
John McLear 54bf17bfea fix error on focus remove from import/export 2014-03-29 13:32:34 +00:00
John McLear c1ef3f4801 Merge pull request #2117 from ether/doc/asset-css-suit-up 
Polish the styles of our docs a little
 2014-03-27 17:09:50 +00:00
Marcel Klehr 3a82cba4c5 Polish the styles of our docs a little 2014-03-27 18:08:55 +01:00
John McLear 56fd078469 Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages 
Fix crash with queued messages
 2014-03-26 19:39:19 +00:00
John McLear e23af7e439 changelog, package file and fix for redo 2014-03-26 15:44:04 +00:00
John McLear dc1a33bead Merge pull request #2111 from ether/quickfix/req_cs-bounds-check 
Fix REQ_CS rev boundary check
 2014-03-20 20:35:48 +00:00
Marcel Klehr f6f319960d Fix REQ_CS rev boundary check 
fixes #2096
 2014-03-20 21:34:01 +01:00
Siebrand Mazeland ba38bc998e Localisation updates from https://translatewiki.net. 2014-03-18 12:14:27 +00:00
John McLear e1fa43e640 quick formatting clean up 2014-03-17 19:20:32 +00:00
John McLear 8cd9b98b76 Merge pull request #2110 from ether/modularize-toolbar 
Modularize toolbar
 2014-03-16 17:19:22 +00:00