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

4526 Commits (e2a0e3cd7feaf9e651064e9caf7747da150de68f)

Author SHA1 Message Date
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
John McLear 2ad4c96c4b Merge pull request #2496 from ether/master 
Merge branch master back to develop
 2015-01-25 23:13:32 +00:00
John McLear fb980031ba Merge pull request #2495 from ether/release/1.5.1 
Release/1.5.1
 2015-01-25 21:17:44 +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 c77e115282 Merge pull request #2492 from ether/patch-changelog 
Update CHANGELOG.md
 2015-01-24 22:29:45 +00:00
John McLear f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
Stefan c80a64a379 Update CHANGELOG.md 2015-01-24 19:24:20 +01:00
John McLear af7cd91a82 formatting 2015-01-24 15:14:19 +00:00
John McLear 85c1787184 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-24 15:13:34 +00:00
John McLear e41b3ae0a3 updated CL 2015-01-24 15:13:26 +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 378ed02269 docs 2015-01-24 13:30:03 +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
John McLear 10d4e27073 Merge pull request #2489 from Gared/update_column_plugin_list 
Add 'last update' column to plugins table
 2015-01-24 13:14:52 +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 4ecf0dfad2 docs for export HTML 2015-01-24 02:24:10 +00:00
John McLear 4fa47ea969 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-24 02:20:34 +00:00
John McLear c878a957b7 fix issue in docs 2015-01-24 02:18:59 +00:00
John McLear 7493cd994e Merge pull request #2484 from kaystrobach/patch-1 
Add: How to create an issue
 2015-01-23 12:27:47 +00:00
Kay Strobach 1f023c52bc Add: How to create an issue 
How to create an issue and which information should be given
 2015-01-23 08:14:01 +01:00
John McLear 5dce72d419 chrome list handling fix for #2412 2015-01-23 01:47:12 +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 a58507e811 Merge pull request #2480 from ether/IE-again 
Butching an IE fix..
 2015-01-21 15:21:53 +00:00
John McLear 3cd8759cec expose modernIE value 2015-01-21 15:21:31 +00:00
John McLear 26a1584470 fix tests w/ new context 2015-01-21 15:21:15 +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 f880b0feb7 clean up iojs 2015-01-21 12:18:38 +00:00
John McLear eacf1118f8 blind attempt to try 2015-01-21 02:55:03 +00:00