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

1679 Commits (70fb76511863448bea0f254f3cdd578317c96d23)

Author SHA1 Message Date
John McLear dfd81b79d4 Merge pull request #738 from cweider/packaging 
Packaging
 2012-05-28 17:08:23 -07:00
Chad Weider 819fb76dcd These definitions are meaningless. 2012-05-28 16:43:20 -07:00
Chad Weider a28bbd0b3f Definition will not have an effect if already defined - force redefinition. 2012-05-28 16:43:20 -07:00
Chad Weider 774e2a1517 Fix indentation. 2012-05-28 16:43:20 -07:00
John McLear 95b9cf4f62 Merge pull request #737 from cweider/packaging 
Packaging
 2012-05-28 15:28:50 -07:00
Chad Weider a8340dfbbe Remove the libraries that are a part of ace2_common package. 2012-05-28 15:14:52 -07:00
Chad Weider 7f9bfd6b26 Add comments to templates. 2012-05-28 15:14:52 -07:00
Chad Weider 96ab3dc3b4 jQuery is packaged - this is pure duplication. 2012-05-28 15:14:52 -07:00
Chad Weider d5ac2bfb71 Explicitly require jQuery before using it. 2012-05-28 15:14:52 -07:00
Chad Weider 595fc5710e Add ace2_common to bottom of the page includes. 2012-05-28 15:14:52 -07:00
Chad Weider c4c30bf725 Correct parent_require path. 2012-05-28 15:14:51 -07:00
Chad Weider 299a90b3ba Fix paths for ace files. 2012-05-28 15:14:51 -07:00
John McLear cf9c250373 Merge pull request #736 from cweider/fix-ie 
Fix ie
 2012-05-28 14:48:06 -07:00
Chad Weider 9def552d3c Remove trailing comma added in e661f653b1. Fixes #733. 2012-05-28 14:40:08 -07:00
John McLear bd07589e0f fixing start.bat so server begins.. 2012-05-28 20:19:49 +02:00
johnyma22 50b061cb6a Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-05-28 19:09:43 +01:00
0ip d4b4ca0a5c Center user icon and fix overlapping chat 2012-05-23 20:40:24 +03:00
John McLear 26614bf2d5 You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594 2012-05-23 01:01:50 +02:00
John McLear d1c2d12150 Import Should now work in IE 2012-05-23 00:52:10 +02:00
John McLear dafa44e6b4 I hate how hacky this change is. 2012-05-23 00:51:03 +02:00
John McLear b27287ce37 Update src/node/handler/ImportHandler.js 2012-05-23 00:49:12 +02:00
John McLear c8b93f6ddc Fix IE import 2012-05-23 00:46:56 +02:00
John McLear 9c6731f3b8 No comet required on landing page 2012-05-22 21:30:50 +02:00
John McLear 5e5a4446bc Merge pull request #723 from fourplusone/fix/fix-722 
fix #722 by better argument checking in PadMessageHandler.js
 2012-05-22 05:31:48 -07:00
John McLear c30d2fde96 Merge pull request #724 from fourplusone/fix/fix-722-develop 
fix #722 in the develop branch
 2012-05-22 05:31:25 -07:00
Matthias Bartelmeß 06c36f3023 fix #722 by better argument checking in PadMessageHandler.js 2012-05-22 09:31:28 +02:00
Matthias Bartelmeß 54511a6cea fix #722 by better argument checking in PadMessageHandler.js 2012-05-22 09:27:08 +02:00
0ip 185a3bface Add def. bg to <select> and remove useless style 2012-05-20 20:19:16 +03:00
johnyma22 28abd527bc Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-05-20 17:54:12 +01:00
John McLear a40475666c Merge pull request #719 from 0ip/fix_css 
Non-floating popups
 2012-05-20 09:52:31 -07:00
0ip fe0ea23299 Fix userlist now showing up 2012-05-20 16:02:51 +02:00
0ip caa56dd32a Add non-floating popups 2012-05-20 15:59:51 +02:00
0ip 19cf43d0a3 Style select (useful for plugins) 2012-05-20 15:38:12 +02:00
0ip 750b9d44df Style selected text 2012-05-20 15:37:03 +02:00
0ip 205797cd83 Remove class duplicate 2012-05-20 15:35:41 +02:00
0ip fbee7dabcf Add grouped buttons 2012-05-20 15:29:10 +02:00
John McLear f3845c4020 Merge pull request #718 from 0ip/remove_old_css 
Remove old Etherpad CSS code
 2012-05-20 05:57:42 -07:00
0ip afe060e2b8 Remove even more old code 2012-05-20 14:53:30 +02:00
0ip 0d68cd23ba Remove old CSS code 2012-05-20 14:48:02 +02:00
johnyma22 102540f51b Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-05-19 13:58:48 +01:00
John McLear fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle 
Remove wordle
 2012-05-19 05:58:38 -07:00
johnyma22 bd30045d44 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-05-19 13:42:29 +01:00
John McLear 53bfc380af Merge pull request #703 from cweider/remove-onclick 
Remove onclick
 2012-05-19 05:41:49 -07:00
John McLear f3036eb124 Merge pull request #715 from redhog/master 
Bugfix for IE and document.domain
 2012-05-18 10:19:44 -07:00
Egil Moeller 9f46678e5d Bugfix for IE and document.domain 2012-05-18 18:57:18 +02:00
John McLear ee11338927 Merge pull request #709 from cweider/packaging 
Packaging
 2012-05-17 04:59:24 -07:00
John McLear 1043d607d0 Merge pull request #712 from edy-b/issue-707 
Don't set cached cookies, fixes issue #707
 2012-05-17 04:57:22 -07:00
Edy e8639d87ce fixes issue #707 
Don't set cached cookies
 2012-05-17 12:08:19 +02:00
Egil Moeller fc946ffc33 Hide editing buttons when in readonly mode 2012-05-17 12:03:38 +02:00
Chad Weider a9eb2d4e31 Fix ordering of editer code loading operations. 2012-05-14 19:01:00 -07:00