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

4106 Commits (e39b4428405d186796c56bb0fd18785bec0b5628)

Author SHA1 Message Date
John McLear e39b442840 bump v for #2505 fix 2015-02-13 01:25:29 +00:00
John McLear c481d135a5 Merge pull request #2517 from ether/version-on-admin-page 
Puts Git revision on the info page
 2015-02-11 18:07:00 +00:00
John McLear d0caebc21f may aswell make the git sha a link to the commit 2015-02-11 18:05:01 +00:00
John McLear ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
John McLear 7e7eb542be Merge pull request #2515 from ether/rewrite-pad-path 
seems right
 2015-02-11 02:07:58 +00:00
John McLear 275592e423 seems right 2015-02-11 02:07:20 +00:00
John McLear 0ad09c17db fix JS error in timeslider if offset doesn't exist 2015-02-09 23:04:30 +00:00
John McLear 26ae375727 minor css polish for user input 2015-02-09 19:53:32 +00:00
John McLear ac7a5689af Merge pull request #2510 from ether/chat-users-flow-css 
better css
 2015-02-09 19:47:14 +00:00
John McLear b216f9271b should be final logic for chatandusers 2015-02-09 19:11:35 +00:00
John McLear 5245d2b797 and even mroe polish 2015-02-09 18:36:11 +00:00
John McLear 8c6507e78c more styling stuff 2015-02-09 18:01:45 +00:00
John McLear 4af46921e1 better css 2015-02-09 17:37:20 +00:00
John McLear 5c31d1f528 Merge pull request #2508 from ether/fix-chat-scroll 
Fix chat scroll
 2015-02-08 14:35:59 +00:00
John McLear ebff7d128b cleaner fix for queue issue 2015-02-08 14:35:22 +00:00
John McLear 7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +00:00
John McLear 4e3c106192 Merge pull request #2507 from ether/fix-chat-scroll 
fix scroll issue where focus is not well managed
 2015-02-07 23:26:50 +00:00
John McLear 1652ed42c5 fix scroll issue where focus is not well managed 
remove console logs
 2015-02-07 23:26:02 +00:00
John McLear fe4dd98a6e remove console logs 2015-02-07 23:24:24 +00:00
John McLear 4c667ecef6 fix scroll issue where focus is not well managed 2015-02-07 23:23:33 +00:00
John McLear b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
John McLear 9afcd89167 bump versions to see if it's stable 2015-02-04 17:52:27 +00:00
John McLear f0d29567b5 Merge pull request #2500 from JulR43/patch-1 
Change git-core to git
 2015-02-01 23:31:54 +00:00
John McLear 35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +00:00
JulR43 b9b110c82f Change git-core to git 
git-core package is an obsolete transitional package, it was renamed git.
 2015-01-28 17:29:16 +00:00
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 b8ac349b53 Update hooks_client-side.md 2015-01-26 16:07:46 +00:00
John McLear 2c3ce30fed docs 2015-01-26 02:42:48 +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
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