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

1981 Commits (1c05933dc91c9669a2f8407ab471c204f6975e98)

Author SHA1 Message Date
John McLear 0216a10a12 better variable name 2015-01-27 20:10:38 +00:00
John McLear a9910c741e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-27 19:41:09 +00:00
John McLear bdfce1cbef change to cc.. 2015-01-27 19:41:01 +00:00
John McLear 8fbd7d83b6 content collector should also register the blocks, no idea why this wasnt in before 2015-01-27 19:16:36 +00:00
Siebrand Mazeland 78c3a8d65b Localisation updates from https://translatewiki.net. 2015-01-26 22:58:30 +01:00
John McLear b6e7ddf874 bump v 2015-01-26 16:11:15 +00:00
John McLear 4de42da2e3 Merge pull request #2497 from ether/image-support-hook 
clean support for image hook
 2015-01-26 16:07:56 +00:00
John McLear c4f1189ebd even cleaner 2015-01-26 02:39:43 +00:00
John McLear 18121a1507 much cleaner 2015-01-26 02:32:58 +00:00
John McLear 8156930208 clean support for image hook 2015-01-26 01:44:40 +00:00
Stefan 4c64b7a670 Revert 'asyncLineHTMLForExport' hook 2015-01-25 22:08:40 +01:00
John McLear aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear 831151cfba Merge pull request #2487 from ether/html-e-hook 
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
 2015-01-25 00:07:34 +00:00
John McLear f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
John McLear c798a27ad8 boop 2015-01-24 13:39:45 +00:00
John McLear 3f08bf7405 Merge pull request #2490 from Gared/https_plugins_json 
Use https to download plugins.json
 2015-01-24 13:34:41 +00:00
John McLear 85c5cc80d0 Merge pull request #2488 from webzwo0i/fix-session-without-auth-crash 
Stop processing a message without auth (i.e. a client did not send
 2015-01-24 13:15:58 +00:00
Stefan da86110f58 Use https to download plugins.json 2015-01-24 12:55:17 +01:00
Stefan 713b369fc3 Add 'last update' column to plugins table 2015-01-24 12:49:17 +01:00
webzwo0i 6b0cf29af6 Stop processing a message without auth (i.e. a client did not send 
CLIENT_READY)
 2015-01-24 06:34:41 +01:00
John McLear 1890ba3976 working, might need polish its pretty late 2015-01-24 05:14:38 +00:00
John McLear 9abb85799c realization how aCallAll works 2015-01-24 04:31:50 +00:00
John McLear 372063295f beginning of a hook, needs docs etc 2015-01-24 04:09:13 +00:00
John McLear 6fd0285d4d include lineContent in hok 2015-01-21 21:36:11 +00:00
John McLear 036dea3d0f styling 2015-01-21 17:25:06 +00:00
John McLear 657974b518 move saved revs notification to gritter 2015-01-21 16:40:44 +00:00
John McLear aee0fd797d working translation 2015-01-21 16:11:00 +00:00
John McLear 753e8fdf0b working logic 2015-01-21 16:08:54 +00:00
John McLear 17fa87552d styling 2015-01-21 15:48:21 +00:00
John McLear 941cc3c24b url param 2015-01-21 15:37:55 +00:00
John McLear 920ec9c553 Merge pull request #2467 from ether/chat-and-users 
Show users and Chat at the same time
 2015-01-21 15:22:23 +00:00
John McLear 3cd8759cec expose modernIE value 2015-01-21 15:21:31 +00:00
John McLear 3fd6e72657 try again 2015-01-21 15:06:29 +00:00
John McLear a2cb8a2f19 rename back to browser 2015-01-21 15:01:39 +00:00
John McLear 7237a3b7cc bump ueberdb 2015-01-21 14:58:47 +00:00
John McLear f2891e3b8b working 2015-01-21 14:55:29 +00:00
John McLear ce40cacafa mheh looks fixed 2015-01-21 14:49:06 +00:00
John McLear 990e14c904 working with a big hack 2015-01-21 14:25:24 +00:00
John McLear 34d6b31c98 some sanity 2015-01-21 13:24:21 +00:00
John McLear eacf1118f8 blind attempt to try 2015-01-21 02:55:03 +00:00
John McLear cb65224997 better logic for author handling 2015-01-21 00:28:00 +00:00
John McLear 5f9bbd0666 restrict expor4t to only expose this pad ID 2015-01-21 00:03:39 +00:00
John McLear 531d25ab84 freeze deps 2015-01-20 23:50:55 +00:00
John McLear 84638a39b7 Merge pull request #2469 from ether/new-sethtml-tests 
I need to do some more work on this at some point..  Leaving here
 2015-01-19 15:51:37 +00:00
John McLear c315defc31 temp bodge fix 2015-01-19 15:15:52 +00:00
John McLear ab71bc7c20 hrm 2015-01-19 14:45:49 +00:00
John McLear edbeb66d5e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-19 14:33:17 +00:00
John McLear 44d1d6cc13 fix ie editing 2015-01-19 14:32:58 +00:00
John McLear 4ab4c9998b Merge pull request #2470 from cetra3/timeslider_proxy_fix 
Timeslider proxy fix
 2015-01-19 13:32:03 +00:00
Siebrand Mazeland 28aeeff154 Localisation updates from https://translatewiki.net. 2015-01-19 09:28:03 +01:00
Cetra Free f1c9c58c2d Update to timeslider to include base path for easier proxying 2015-01-19 14:28:30 +10:30
Cetra Free 3649118194 Update to timeslider to include base path for easier proxying 2015-01-19 14:25:06 +10:30
John McLear 4f637befeb more fixing 2015-01-19 02:59:17 +00:00
John McLear 85fffbe14c more handling 2015-01-19 02:57:10 +00:00
John McLear cadb83ac5a bumpage 2015-01-19 02:51:32 +00:00
John McLear 13eff60dfe mheh I suck at css 0ip would do a way better job of this 2015-01-19 02:13:34 +00:00
John McLear 63c65f784b semi working example 2015-01-19 01:45:49 +00:00
John McLear 73d6030762 boop 2015-01-19 00:36:12 +00:00
John McLear 33c62329ba better regexp for line items 2015-01-19 00:28:32 +00:00
John McLear 0bd7914c3b dont paste on middle click of link 2015-01-18 23:58:47 +00:00
John McLear 6bc74a9adb more export logic handling 2015-01-18 23:33:29 +00:00
John McLear e50ea6ffea whoops proper regexp fix for listNumber 2015-01-18 23:24:20 +00:00
John McLear bd9ff770fe reset all numbers on first item 2015-01-18 23:21:34 +00:00
John McLear ce41bcea2f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-18 23:17:06 +00:00
John McLear af70902bef support deeper nested elements on exports 2015-01-18 23:16:58 +00:00
John McLear 7e69bc65ce remove infinite load was causing pain 2015-01-18 23:03:54 +00:00
John McLear 689ced8443 and this one.. 2015-01-18 20:15:17 +00:00
John McLear c0a4051b7a use etherpads own yajsml 2015-01-18 20:12:02 +00:00
John McLear ca6b729ace fix for ep page view pageup/down 2015-01-18 19:58:38 +00:00
John McLear 83fae22279 allow list text entry up to 16 items 2015-01-18 15:32:48 +00:00
Stefan 3c6db077ed Change domain for plugins.json request 2015-01-18 14:22:27 +01:00
Stefan 4644073399 Prevent dublicates in search results 2015-01-18 13:56:30 +01:00
Stefan 6d6ddd7f9f Prevent form submit on plugin page 2015-01-18 12:15:41 +01:00
John McLear b2616c820e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-12 00:00:07 +00:00
John McLear a553b44dbc refix plugins 2015-01-11 23:59:18 +00:00
Stefan a080b12eac Add new favicon (32x32) with associated svg file 2015-01-11 22:40:56 +01:00
Timothy Gu 9b9a747167 Support ejs 2.0 
Fixes #2437.

This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
 2015-01-11 08:17:17 -08:00
Marcel Klehr 167e0aea59 Merge pull request #2442 from ether/fix/attribmanager-removeattribonline 
Finally fix AttribManager#removeAttributeOnLine
 2015-01-10 16:35:37 +01:00
webzwo0i 82efcdb430 fix for uls without class 2015-01-09 02:04:03 +01:00
John McLear f2c443809f roll ejs back as its broken at v2 2015-01-07 15:18:54 +00:00
John McLear 17ce67d936 final html export hook 2015-01-06 16:31:52 +00:00
Marcel Klehr 751adb24fd Finally fix AttribManager#removeAttributeOnLine 
return safely if the attribute wasn't found.
fixes #2394
 2015-01-05 18:38:34 +01:00
John McLear 26c839063f check file system that abiword exists 2015-01-04 14:47:08 +00:00
Siebrand Mazeland e2ea82f8df Localisation updates from https://translatewiki.net. 2015-01-02 10:58:48 +01:00
John McLear 230302b132 fix timeslider stars and frontend tests, needs css polish 2015-01-01 22:40:45 +00:00
John McLear 45e90e138c v number bump 2015-01-01 16:57:31 +00:00
John McLear 8eb723b906 patch for e1c683be3f 2014-12-31 14:16:10 +00:00
John McLear 036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear 4b6df17e99 Merge pull request #2421 from webzwo0i/fix-swagger 
hack to avoid warnings in swagger usage
 2014-12-31 13:27:00 +00:00
John McLear b5c671a9b6 Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 
Clean-up after removing list attribute: Remove list numbering attribute
 2014-12-31 13:19:24 +00:00
John McLear 335bf3dc4a more line polish 2014-12-31 01:46:53 +00:00
John McLear 01c667aa2e export html more styles 2014-12-31 00:53:20 +00:00
webzwo0i b0da214ad5 hack to avoid warnings in swagger usage 2014-12-30 18:06:41 +01:00
Marcel Klehr cfe75c7f3f Clean-up after removing list attribute: Remove list numbering attribute 2014-12-30 17:45:26 +01:00
Stefan c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
Stefan 5df638bfac Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected 
Notify user if cookies can't be created
 2014-12-30 14:54:43 +01:00
John McLear 90e83ed6b5 more styling 2014-12-30 14:53:44 +01:00
John McLear 716b1c6113 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-30 14:44:55 +01:00
John McLear 16713d8b3b some demo export loic for handling OL incrementation 2014-12-30 14:43:00 +01:00
John McLear 4687d226c6 Merge pull request #2417 from webzwo0i/fix-export 
Fix ExportHtml.js list parsing code
 2014-12-30 13:47:31 +01:00