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

3952 Commits (45e90e138c1abda729855f4ae301ba90783011a6)

Author SHA1 Message Date
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 a8d9a3868d docs for new hook 2014-05-06 21:22:03 +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
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
jdittrich a4f2ebe57e Update package.json 
updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
 2014-03-26 18:22:41 +01: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
Marcel Klehr a69793a203 Add docs for toolbar controller and pad_editbar 2014-03-16 15:43:38 +01: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
John McLear 44f8b43719 Update CONTRIBUTING.md 2014-03-15 17:26:02 +00:00
John McLear cd0f5742f6 Merge pull request #2108 from goldquest/dev_deleteSessionBug 
Session deletion error, when group2session/author2session are not available
 2014-03-14 17:22:46 +00: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