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

280 Commits (1df9d04e0495a1b15c2f0ff8b98b7f08d0380cac)

Author SHA1 Message Date
John McLear 1df9d04e04 Fix for farbtastic in IE9, I had to recreate the file because the original commit was so messy 2011-08-21 19:08:19 +01:00
Peter 'Pita' Martischka 0b18e46bc3 keep the userlist open while editing 2011-08-21 19:07:35 +01:00
Peter 'Pita' Martischka 4f233d88f8 fixed the backward compatility to old colorIds 2011-08-21 18:53:30 +01:00
Peter 'Pita' Martischka 6c354c6333 improved the design of the user icon 2011-08-21 18:18:35 +01:00
Peter 'Pita' Martischka 070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01:00
Robin Buse 82e4d7fe7d Edited static/css/pad.css via GitHub 2011-08-21 09:45:05 +03:00
Peter 'Pita' Martischka 42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka 9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +01:00
Peter 'Pita' Martischka 8214e132b7 Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite 2011-08-18 21:05:44 +01:00
Peter 'Pita' Martischka 71c6e494d5 fixed the buttons, the now fully clickable (someone has to test that with IE) 2011-08-18 12:16:00 +01:00
Peter 'Pita' Martischka cb23b140d6 Merge pull request #87 from 0ip/patch-1 
Redesigned start page
 2011-08-17 12:27:17 -07:00
Peter 'Pita' Martischka b02ee510ac Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite 2011-08-17 19:58:37 +01:00
Robin Buse d3a33024ec reverted js functions but reduced if clause using ternary operation 2011-08-17 21:58:07 +03:00
Peter 'Pita' Martischka c8a0f946f2 Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite 2011-08-17 19:43:39 +01:00
Peter 'Pita' Martischka c7f3b3d9ec Merge branch 'patch-2' of https://github.com/0ip/etherpad-lite 2011-08-17 19:36:56 +01:00
Peter 'Pita' Martischka c2457e06d8 send client side javascript errors to the server 2011-08-17 19:24:44 +01:00
Peter 'Pita' Martischka 84f1baf972 fixed a small css bug at the disconnect message 2011-08-17 18:11:36 +01:00
Robin Buse 58ea0d0ed3 changed .gif to .png 2011-08-17 19:14:43 +03:00
Robin Buse 06037dcb8e added transparent icons 2011-08-16 22:59:17 +02:00
Robin Buse d4b713d236 colorized the return link and removed some odd stuff 2011-08-16 23:49:52 +03:00
Robin Buse ac0dff0c2c height @ #editbar ul is redundant && removed some space 2011-08-16 23:44:43 +03:00
Robin Buse 6f7a9ce77a Redesigned pad editbar + chatbox (bg color) 2011-08-16 23:40:07 +03:00
Robin Buse 47a16ddbe2 QR code support (js) 2011-08-16 23:34:05 +03:00
Robin Buse 6d47a00f29 QR code support (html) 2011-08-16 23:31:41 +03:00
John McLear 5d30c8b4a5 Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue 2011-08-16 21:29:51 +01:00
Robin Buse 4aeb76cdac Reworked the start page (brighter, added top bar, font on Windows sharper), fixed some padding bugs (firefox) and compressed the js 2011-08-16 23:25:42 +03:00
Peter 'Pita' Martischka d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
Peter 'Pita' Martischka 3ff34f50d1 added a security control at socketiorouter, pad security is now fully enforced 2011-08-16 15:53:09 +01:00
Peter 'Pita' Martischka 48980f9e19 Show permission messages on the browser side 2011-08-15 18:27:11 +01:00
Peter 'Pita' Martischka 255dc5a325 fixed merge conflicts 2011-08-15 16:58:22 +01:00
John McLear 7d1dbae5e5 Add pad.css and custom/pad.css availability into the iFrame as a fix for issue 83 2011-08-15 15:49:09 +01:00
John McLear 37224f620f Fix issue 82, bullets not showing up in time slider, please note that the timeslider may have other css bugs such as indent etc and this needs testing 2011-08-15 15:48:49 +01:00
Peter 'Pita' Martischka 37a220fa87 fixed opera bug thx @johnyma22 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka b300dc1d2c fixed merge conflicts 2011-08-13 22:18:42 +01:00
John McLear db3ee19ced Added support for monospace font to be passed as a parameter in the URL 2011-08-13 22:10:58 +01:00
Peter 'Pita' Martischka d0e378f63a added a security manager to control pad access on group pads 2011-08-13 22:07:21 +01:00
John McLear 4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +01:00
John McLear bba9cd515b Added support for changing username from the URL ie ?userName=JohnMcLear -- doesnt urldecode etc. needs checking for vulnerabilities too 2011-08-13 19:53:02 +01:00
John McLear 7f28889660 Removed my cake commit that I used as a placemarker 2011-08-13 18:38:00 +01:00
John McLear 8db0c12bbe Add support for removing line numbers using the jQuery API and stopped it publishing that change back if the param is set 2011-08-13 18:37:44 +01:00
John McLear fb593c1d5c Began adding support for passing parameters via the URL and removed a location redirect that was no longer needed 2011-08-12 16:00:09 +01:00
Peter 'Pita' Martischka 0e05e58c76 changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd) 2011-08-11 15:27:16 +01:00
Peter 'Pita' Martischka 38801fa3b2 added a ugly favicon, to motivate people creating a better one ;) 2011-08-11 15:16:26 +01:00
Peter 'Pita' Martischka 9cc3b543cc Merge branch 'master' of git://github.com/Pita/etherpad-lite into api 2011-08-10 22:47:50 +01:00
Peter 'Pita' Martischka ce1012438e added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected 2011-08-10 22:44:16 +01:00
Peter 'Pita' Martischka dc15682a27 changed name of getMapped*4 functions to create*IfNotExistsFor 2011-08-10 22:43:38 +01:00
Peter 'Pita' Martischka 578f8db311 improved test.html 2011-08-10 22:43:29 +01:00
Randy 9f530962ee Add js tests to assist with api development 2011-08-10 22:43:20 +01:00
Peter 'Pita' Martischka 3c46cce341 some small design changes 2011-08-10 18:26:12 +01:00
Peter 'Pita' Martischka 13c10013b9 do the chat resize without hiding the pad text 2011-08-10 18:18:50 +01:00