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

314 Commits (05c2e0fde521b17a8229ac4d2f0478c71bef17d4)

Author SHA1 Message Date
Peter 'Pita' Martischka 177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01:00
Peter 'Pita' Martischka 4e592def7e fixed color chooser 2011-08-21 19:27:02 +01:00
John McLear c1272ed566 Fixed minor German effort at English ;) 2011-08-21 19:21:23 +01:00
Peter 'Pita' Martischka 307d0acdeb put expolorer canvas into minify 2011-08-21 19:20:18 +01:00
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 070b5f16f7 added the default embed parameters to the embed code 2011-08-21 16:44:38 +01: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 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
Robin Buse 47a16ddbe2 QR code support (js) 2011-08-16 23:34:05 +03:00
Peter 'Pita' Martischka d2c502e2be added deletePad API function 2011-08-16 20:02:30 +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
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 13c10013b9 do the chat resize without hiding the pad text 2011-08-10 18:18:50 +01:00
Peter 'Pita' Martischka d812557445 fixed #73 2011-08-10 18:06:22 +01:00
Peter 'Pita' Martischka 053e48c3f4 Secure the call of the costumStart function 
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
 2011-08-01 12:09:33 +01:00
Peter 'Pita' Martischka de32503f8e improve including of custom js/css 2011-07-31 17:21:01 +01:00
Peter 'Pita' Martischka bcaadfa6eb Ensure the browser doesn't send socket.io message with the browser version 2011-07-31 16:13:56 +01:00
Peter 'Pita' Martischka aa5b1b85ae fixed all random string functions 2011-07-31 11:48:06 +01:00
Peter 'Pita' Martischka 115f7d6b51 Fixed the iframe problems 2011-07-27 15:11:30 +01:00
Peter 'Pita' Martischka e96595896c Fixed wordle export under https 2011-07-27 13:35:22 +01:00
Peter 'Pita' Martischka 6867d881b1 Hide import/export options that are not avaiable if abiword isn't configured 2011-07-26 18:54:42 +01:00
Peter 'Pita' Martischka b43c7e7c99 ensure non url chars are not used for pad names or pad links 2011-07-26 16:17:02 +01:00
Peter 'Pita' Martischka eb40c014b6 Fixed the NaN Bug on timeslider 2011-07-25 17:26:56 +01:00
Peter 'Pita' Martischka e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01:00
Peter 'Pita' Martischka 3ccdcec7e8 ensure we don't send a handshake on every reconnect 2011-07-22 14:17:58 +01:00
Peter 'Pita' Martischka a717e07531 Moved John's code to the correct place 2011-07-22 14:07:13 +01:00
Peter 'Pita' Martischka b13fbbfd73 Import works now on the server side 2011-07-21 20:13:58 +01:00
John McLear 4b268f9579 Make a pulsating chat notification and remove the throb from the tab 2011-07-20 21:50:58 +01:00
John McLear 2920c35c0f Now import/Export works 2011-07-20 17:33:27 +01:00
John McLear 43508a32a3 Ensure the last chat comment is always in focus after resize 2011-07-20 17:23:01 +01:00
John McLear 4f06d4688f Add wordle support, temporary, Pita to move 2011-07-20 16:38:03 +01:00
John McLear 802866a5da Open link in new window file 2011-07-20 16:01:26 +01:00
John McLear 77dc7ede14 change end points to right export endpoint 2011-07-20 15:48:24 +01:00
John McLear 50c6b9de00 Temporary code that brings in some export support 2011-07-20 15:42:47 +01:00
John McLear a07bd76625 Final major add for working buttons in IE 2011-07-19 20:04:36 +01:00
John McLear e7b690c7fc Make the chat work in IE 2011-07-19 20:04:24 +01:00
John McLear 9f966e0035 Make CSS more comprehendable by mear mortals. 2011-07-19 20:03:40 +01:00
John McLear f245685c3a Remove a line break.. heh 2011-07-19 20:03:01 +01:00
John McLear 65baa26fca Resize chat 2011-07-19 20:02:48 +01:00
John McLear 0643bb888f Remove old jquery ui file 2011-07-19 20:02:35 +01:00
John McLear f7ce124ce2 Add a new version of jquery ui with support for resizable 2011-07-19 20:02:29 +01:00
John McLear 2dd2a4a055 Added support to resize chat 2011-07-19 20:02:03 +01:00
John McLear ab7b043fd1 Dont show IP addy or browser info when hovering# 2011-07-19 20:01:36 +01:00
Peter 'Pita' Martischka f871602754 remove the 32000 px lock, thx to @smesher 2011-07-14 18:38:29 +01:00
Peter 'Pita' Martischka 29878e648e added a Chat 2011-07-14 16:15:38 +01:00
Peter 'Pita' Martischka 1c1e035bf1 Show a read only link on the pad 2011-07-08 17:42:07 +01:00
Peter 'Pita' Martischka 7915390b83 select the embed code when it drops down 2011-07-08 15:37:57 +01:00
Peter 'Pita' Martischka cbbb0a4ed1 cleaned the dropdown code a lot 2011-07-08 15:19:38 +01:00
Peter 'Pita' Martischka 271ee1776b beautified all static js files 2011-07-07 18:59:34 +01:00
Peter 'Pita' Martischka ac1858f8ec Fixes a problem with the resource path of socket.io 2011-07-06 19:51:41 +02:00
Peter 'Pita' Martischka 9db609ecc1 beautify the colorpicker 2011-07-06 14:08:20 +01:00
Peter 'Pita' Martischka b46c0e3b3c Let the embed code and the userbar slide down with an animation 2011-07-06 13:42:00 +01:00
Peter 'Pita' Martischka 973d73ebee ensure all paths are relative 2011-07-05 20:16:45 +02:00
Peter 'Pita' Martischka af57413cfa Ops, forgot the static files 2011-06-23 14:09:41 +01:00
Peter 'Pita' Martischka fd5aafe17a update to socket.io 0.7.2 2011-06-23 12:33:31 +01:00
Peter 'Pita' Martischka add35f16fd clean the code 2011-06-20 15:59:27 +01:00
Peter 'Pita' Martischka 867525945d Timeslider is working 2011-06-20 15:37:41 +01:00
Peter 'Pita' Martischka 44aa476ec0 A lot small changes that results in a timeslider that shows the latest text 2011-06-20 11:44:04 +01:00
Peter 'Pita' Martischka b692ffec0b Changing behavior of the same user on a pad. Kick old sessions instead of refusing new 2011-06-04 18:02:22 +01:00
Peter 'Pita' Martischka 3b2a601beb Revert "Don't try to reconnect if we reset the connection on our own" 
Don't think this is necassary, the problem might be caused by of a old socket.io version

This reverts commit a444e870e0.
 2011-06-02 14:17:15 +01:00
Peter 'Pita' Martischka cc7cc8d884 Add a proper double connect Message 2011-06-02 01:55:09 +01:00
Peter 'Pita' Martischka a444e870e0 Don't try to reconnect if we reset the connection on our own 2011-06-02 01:03:35 +01:00
Peter 'Pita' Martischka 6122929461 Removed 404 links and some other unused images 2011-06-02 00:28:08 +01:00
Peter 'Pita' Martischka 18ec4dab87 Let client Socket.IO set the options on its own, I think this solves some proxy problems 2011-05-30 21:57:56 +01:00
Peter 'Pita' Martischka aac1e25c9e Change all absolute paths to relative paths, fixed #13 2011-05-28 21:05:43 +01:00
Peter 'Pita' Martischka 0c3f0e981a Minify and compress JS & CSS before sending it 2011-05-28 18:09:17 +01:00
Peter 'Pita' Martischka 80e4f9f5ff Removed this > next to the embed code 2011-05-23 23:02:10 +01:00
Peter 'Pita' Martischka a800e8d4dc Removed unused JS 2011-05-23 22:48:41 +01:00
Peter 'Pita' Martischka 0335e48e35 Show the padname in the html title 2011-05-23 22:30:49 +01:00
Peter 'Pita' Martischka 509498f141 Removed unused images and move them all in one folder 2011-05-23 22:24:49 +01:00
Peter 'Pita' Martischka 3cef5e4b23 Detect connection type before etablishing the socket connection, should solve a problem with a https proxy in front 2011-05-23 19:29:39 +01:00
Peter 'Pita' Martischka a72d68a4fe 'Reconnect Now' does now a proper reconnect 2011-05-19 22:27:17 +01:00
Hans Pinckaers 7fb631b922 fixed color picker for firefox 4. 2011-05-16 14:15:06 +02:00
HansPinckaers dc15daaa40 broke ie/ff working again 2011-04-07 21:34:06 +02:00
HansPinckaers ad86901f0b online counter now working 2011-04-07 21:18:49 +02:00
HansPinckaers efdb3b8963 fixed userlist css 2011-04-07 21:08:41 +02:00
HansPinckaers d53f155c56 removed logging 2011-04-07 20:59:18 +02:00
HansPinckaers 0b8b380d2b userlist/embed working again 2011-04-07 20:45:28 +02:00
HansPinckaers 5dc72234ab fixed html (with whitespace realigned), color choosing is now working. Still needs work. 2011-04-06 22:36:20 +02:00
HansPinckaers 9eb1fecfa7 Merge remote branch 'johns/master' 2011-04-06 19:31:23 +02:00
Peter 'Pita' Martischka b7c58a5e09 Added client side logging on handshake 2011-03-28 14:12:33 +01:00
Peter 'Pita' Martischka f28a5c18c6 Some improvements on message handling, on client and serverside 2011-03-27 12:49:04 +01:00
John McLear 9a6fe31419 Removed trailing , that broke IE7 2011-03-27 10:46:45 +00:00
John McLear 9e70313c0d Added simple Json.js to support old versions of IE 2011-03-27 10:28:55 +00:00
John McLear 51798f3862 Removed docbarstates.png as it included HTML 2011-03-27 10:08:08 +00:00
John McLear 78d8e18634 Remove overlay.png as it included HTML 2011-03-27 10:06:16 +00:00
John McLear 750c75e1dc Fix bug where it displayed users when showing embed div 2011-03-26 19:57:17 +00:00
John McLear b26b1ebf15 Fix iFrame issue where console is set to top. and change to window. 2011-03-26 19:47:31 +00:00
John McLear 3b029b638d more css for users stuff 2011-03-26 18:45:35 +00:00
John McLear 2c8a5987e4 Removed some uservoice and feedback chuf 2011-03-26 17:41:56 +00:00
John McLear 5170c29e18 Fix css href 2011-03-26 17:16:19 +00:00
John McLear 1afc41d606 Fix minor css bug in embed part 2 2011-03-26 16:04:07 +00:00
John McLear 10417db768 Fix minor css bug in embed 2011-03-26 16:03:05 +00:00
John McLear 8117834010 Embed JS 2011-03-26 16:00:04 +00:00
John McLear 46f1eb4139 Add toggle functionality for users 2011-03-26 15:08:39 +00:00
John McLear 6d2bfc647b Added some animation for user bar 2011-03-26 14:50:13 +00:00
Peter 'Pita' Martischka 437cd90b90 Removing unused files 2011-03-26 13:49:01 +00:00
Peter 'Pita' Martischka 6c05ef8746 outcomment the message recieve on the client side ;) 2011-03-26 13:31:19 +00:00
Peter 'Pita' Martischka 325c322a27 first-commit 2011-03-26 13:10:41 +00:00