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

1275 Commits (137e06d52b83495883b1f6873b66bdd860e5cb3e)

Author SHA1 Message Date
Chad Weider 24a26953a7 Account for undefined argument. 2012-02-28 18:06:30 -08:00
Chad Weider 96ee77d85b Check error not stats. 2012-02-28 18:05:27 -08:00
0ip 280e07d737 Merge pull request #519 from 0ip/cssfix2 
CSS improvements 2
 2012-02-28 12:41:27 -08:00
0ip b507f48a34 typos 2012-02-28 21:37:10 +01:00
0ip 5db8c5bda9 properly display number of users when more than 99 are on a pad + added ids + aligned chatlabel 2012-02-28 21:21:59 +01:00
Egil Moeller a894fcd4f9 Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
Egil Moeller cf191df0b8 So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage... 2012-02-28 21:14:31 +01:00
Egil Moeller b20b86cdc8 Partial bugfix 2012-02-28 17:52:30 +01:00
Stefan 'Gared 051930e2c7 Added errorId to error message and shows error on screen when pad dies on loading 2012-02-28 13:38:29 +00:00
Chad Weider af4bd5ca65 Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/js/pad.js`. 2012-02-27 23:14:49 -08:00
0ip 16f1b53044 Merge pull request #514 from 0ip/cssfix 
CSS improvements
 2012-02-27 13:47:05 -08:00
0ip a17a04182a fix weird looking input [IE7] 2012-02-27 22:40:47 +01:00
0ip d8a0584768 more subtle ui feedback when pressing buttons 2012-02-27 22:29:21 +01:00
0ip eddbc950dd combined css class 2012-02-27 22:06:46 +01:00
0ip 5bfde917b0 revert viewport to fix #508 2012-02-27 22:04:03 +01:00
Peter 'Pita' Martischka 599c8c7c12 update dependencies 2012-02-27 19:55:43 +01:00
Peter 'Pita' Martischka 5888f5ff7d @cweider, only Chuck Norris can compute in json files 2012-02-27 19:54:54 +01:00
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
Egil Moeller 0a4a7f538d Merge branch 'temo' 2012-02-26 22:02:02 +01:00
Egil Moeller 2c7b84ca3e Minify now supports plugins 2012-02-26 22:01:52 +01: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
Egil Moeller 763361a7c9 First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01: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
Egil Moeller fd5b7c1080 require(ep_pluginname/static/blabla); now works both on client and server 2012-02-26 15:34:03 +01: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
Egil Moeller ac7ad6b519 Bugfix for git version extraction code 2012-02-26 14:14:54 +01: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