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

1066 Commits (611cfbd6fa57455aef37fecb10dacde1b4ba5840)

Author SHA1 Message Date
Peter 'Pita' Martischka 611cfbd6fa Merge pull request #468 from cweider/minify-simplify 
Minify Simplification
 2012-02-27 10:00:18 -08:00
Peter 'Pita' Martischka bf42359669 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 17:34:11 +01:00
Peter 'Pita' Martischka d00be5b817 Removed all window.unload event handlers. This kind of fixes #200 2012-02-27 17:33:27 +01:00
John McLear fec8f8a142 Merge pull request #511 from Gared/master 
Added cookie to save option showing author colors and fixed some spelling mistakes
 2012-02-27 07:35:11 -08:00
Stefan 'Gared c54d47e1c6 Added cookie to save option showing author colors 2012-02-27 15:24:36 +00:00
Stefan 'Gared d2cd1213ec Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-27 15:22:15 +00:00
Peter 'Pita' Martischka 0c77052698 Fixed #299 and #338 2012-02-27 14:20:33 +01:00
Peter 'Pita' Martischka 973aad5c96 Fix doesPadExist check 2012-02-27 14:13:47 +01:00
Peter 'Pita' Martischka da2b456b5b Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 00:23:14 +01:00
Peter 'Pita' Martischka ed8aff22d4 restart abiword on crash and give the user feedback about bad import files 2012-02-27 00:22:53 +01:00
John McLear 4fc57921f0 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-26 21:27:06 +00:00
Stefan 'Gared 0336526a64 Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-26 21:26:47 +00:00
John McLear 4dc86f3382 fix #507 import showing when it shouldnt 2012-02-26 21:26:42 +00:00
Stefan 'Gared 6706332e42 Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-26 19:52:09 +00:00
John McLear 7d923277a6 Merge pull request #506 from jucovschi/changeset_docs 
more doc updates on Changeset.js
 2012-02-26 11:14:40 -08:00
Constantin Jucovschi 9fe4318e77 more doc update 2012-02-26 18:59:11 +00:00
Peter 'Pita' Martischka 00c3281a02 Forbid colons, this Fixes #301 2012-02-26 19:59:02 +01:00
John McLear 1b66a48eaf Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-26 18:17:23 +00:00
Peter 'Pita' Martischka c3f728b2ed Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller" 
This reverts commit 9ede14a546.
 2012-02-26 16:13:07 +01:00
John McLear 21246711c1 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-26 15:13:01 +00:00
John McLear aa78456ab9 Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller" 
This reverts commit 9ede14a546.
 2012-02-26 14:49:13 +00:00
John McLear 43e72da0b9 I suck at md. 2012-02-26 14:24:21 +00:00
John McLear 59b414c826 Update README.md 2012-02-26 14:23:59 +00:00
John McLear 45d0d93d03 Update README.md 2012-02-26 14:23:07 +00:00
John McLear af40ea3181 added paypal donation point... 2012-02-26 14:22:32 +00:00
John McLear 979cfdf738 Added foundation flattr account. 2012-02-26 14:20:50 +00:00
Peter 'Pita' Martischka 9709589f87 Merge pull request #505 from jucovschi/changeset_docs 
Documented Changeset.js to the best of my knowledge
 2012-02-26 05:13:27 -08:00
John McLear 8d764cad33 Perma fix for issue #485 and #327 2012-02-26 13:07:09 +00:00
Constantin Jucovschi e318e3d4cb some new docs 2012-02-26 12:59:20 +00:00
Constantin Jucovschi ac86535cdf more docs 2012-02-26 12:59:11 +00:00
Constantin Jucovschi 3abdd34160 writing in jsdoc syntax 2012-02-26 12:59:02 +00:00
Constantin Jucovschi 1e8ef3bb6a commented general functions 2012-02-26 12:58:57 +00:00
John McLear 681e8415b6 Fix issue #485 2012-02-26 12:38:52 +00:00
John McLear 44ec2e148a Merge pull request #502 from drdla/master 
Suggestion for new favicon
 2012-02-25 14:40:35 -08:00
Dominik Rodler 4e54ebb0b8 Added new favicon 2012-02-25 20:45:28 +01:00
John McLear 7e3a3bb9ea Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-25 19:37:29 +00:00
John McLear 2fd1702960 fix sticky chat... dont like where i put the call but it will have to do cause im tired. 2012-02-25 19:35:49 +00:00
0ip 1b339a6a6d Merge pull request #486 from fourplusone/fix_redirect 
use relative path for redirects avoiding problems with reverse proxies
 2012-02-25 11:05:26 -08:00
John McLear a449876f80 Merge pull request #498 from eldiddio/master 
This fixes issue #308
 2012-02-25 09:32:55 -08:00
Mark Fisher 164db7b074 Added test for IE XML HTTP and added link to wiki article 2012-02-25 17:30:59 +00:00
John McLear bbaa6bb7d2 add stuff for how to do load testing 2012-02-25 16:54:27 +00:00
0ip 9790598381 fix for #491 + #415a (floating chat icon) & fixed hidden authorship colors button on iOS 2012-02-25 16:41:10 +01:00
John McLear e9858041a4 Merge pull request #494 from 0ip/miscFix 
Misc fix
 2012-02-25 05:32:29 -08:00
John McLear 1b5a7659c3 fix bug #495 2012-02-25 13:28:47 +00:00
John McLear 706b7b685d change copyright holder in license 2012-02-25 09:44:57 +00:00
John McLear 300418e2b0 Adding full apache license 2012-02-25 09:44:12 +00:00
John McLear 54da9fad73 Merge pull request #466 from fourplusone/cleanup-ace 
Cleanup ace
 2012-02-25 01:34:51 -08:00
Matthias Bartelmeß 0191c248b5 Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix 
Conflicts:
	static/js/ace2_inner.js
 2012-02-24 20:22:32 +01:00
John McLear 64f04670ef Merge pull request #483 from fourplusone/ace2_inner_patch2 
refactored ace_setProperty of ace2_inner.js
 2012-02-24 09:00:18 -08:00
John McLear 04126690fb Merge pull request #480 from fourplusone/ace2_inner_patch-1 
fixed indention + variable scoping
 2012-02-24 08:52:41 -08:00