public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,557 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1554 Commits (44cb676ba2a93d08e218447c07e5928c53ed1beb)

Author SHA1 Message Date
John McLear 44cb676ba2 Merge pull request #2150 from ether/export-file-name-hook 
Server side hook to modify the export file name
 2014-06-16 16:47:15 +01: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
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
Marcel Klehr 19be8763c9 Fix race condition 2014-05-15 12:47:28 +00:00
John McLear c63cb812e8 Update ExportHandler.js 2014-05-15 10:53:37 +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
John McLear a82823ede2 use full string not first char 2014-05-12 15:15:10 +01:00
John McLear d09e66e271 use call first and update docs 2014-05-12 15:08:32 +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 ec6dc4fa0e make async, please check 2014-05-07 16:27:41 +01:00
John McLear 69ba3cc104 remove eplite add etherpad 2014-05-07 15:17:14 +01:00
John McLear 1f7fcd54f1 working logic for allowing a server side hook to modify the export file name but NOT the extension 2014-05-06 21:13:22 +01: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
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 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 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
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
Marcel Klehr da5970dda3 Refactor toolbar.js to use consistent naming 2014-03-16 15:14:21 +01:00
Marcel Klehr 51900cbf67 Toolbar: Allow custom dropdowns for plugins 2014-03-16 14:04:12 +01:00
Marcel Klehr a369347d86 Merge branch 'pr/1579' into toolbar-test 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
 2014-03-16 13:30:22 +01:00
goldquest a00c505403 Sometimes, the author2session / group2session don't exist anymore, but the session does. 
It should be possible to delete a session, if they don't exist
 2014-03-14 17:50:37 +01:00
John McLear cc03f5374c Merge pull request #2089 from dmitryuv/changesetslib-fixes 
fix for infinite loop on bad changeset
 2014-03-13 14:39:19 +00:00
John McLear e12093eb19 Merge pull request #2080 from ether/ignore-ctrl-pageup 
allow tabs to be cycled when focus is in editor
 2014-03-13 00:49:20 +00:00
Siebrand Mazeland 96d06abac0 Localisation updates from https://translatewiki.net. 2014-03-12 12:42:31 +00:00
John McLear f5716a3b26 cleaner logic 2014-03-05 21:44:32 +00:00
John McLear 89d7ba0dc0 merge 2014-03-05 21:27:12 +00:00
John McLear 432438a40d fix dintenation 2014-03-04 23:36:16 +00:00
John McLear c3d62c5fa4 preprocessor for domline attributes 2014-03-04 23:14:15 +00:00