Commit Graph

7261 Commits (3d40ab7e8c8eb161e07b6ae319e34dd0e01cf5b3)

Author SHA1 Message Date
Peter 'Pita' Martischka 3ec7dc224b added a loglevel setting 2011-08-17 17:45:47 +01:00
Peter 'Pita' Martischka 77ba4e3e6c ensure wrong socketio messages doesn't kill the server 2011-08-17 17:28:30 +01:00
Robin Buse 58ea0d0ed3 changed .gif to .png 2011-08-17 19:14:43 +03:00
Peter 'Pita' Martischka 296777ab53 added a graceful shutdown 2011-08-17 15:58:42 +01:00
Peter 'Pita' Martischka 4a803cc543 removed npmignore 2011-08-17 12:30:52 +01:00
Peter 'Pita' Martischka 95b1ac9393 removed sqlite dependency and made dirty the default db 2011-08-17 12:30:35 +01: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 5da30a40bf changed content type of api responses to application/json 2011-08-16 20:06:59 +01:00
Peter 'Pita' Martischka d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
Peter 'Pita' Martischka 783c192726 ensure password and publicStatus functions are only used with group pads 2011-08-16 18:17:46 +01:00
Peter 'Pita' Martischka 1151ec3278 Merge branch 'api' of ../etherpad-lite.dev/ 2011-08-16 17:22:15 +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 da7ddfb5d7 fixed #84 Import bug 2011-08-16 13:40:01 +01:00
Peter 'Pita' Martischka 317370da2c restricted access to pad import and export 2011-08-15 22:20:37 +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
Peter 'Pita' Martischka e24b8ac93a Merge branch 'master' of ../etherpad-lite.devmaster 2011-08-15 16:01:30 +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 793ef42704 added a error message for invalid padIDs 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka 0229217baf updated socket.io 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka 936a9985e1 use the temp enviroment variable for windows 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka b49123230d added the dirty db file to gitignore 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka da6caedb45 fixed abiword on windows 2011-08-15 15:45:28 +01:00
John McLear 10c2497fcc Allow cross site export 2011-08-14 14:47:41 +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
Peter 'Pita' Martischka 4730c3b46e added a error message for invalid padIDs 2011-08-13 20:20:30 +01:00
Peter 'Pita' Martischka 2b266ee82a updated socket.io 2011-08-13 20:06:38 +01:00
Peter 'Pita' Martischka 0384f677b9 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-13 19:54:16 +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
Peter 'Pita' Martischka fd4bdeccb3 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-13 19:05:20 +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
Peter 'Pita' Martischka 3c99e07030 fixed regular expression PadID check 2011-08-13 17:48:36 +01:00
Peter 'Pita' Martischka 3a77d96c98 use the temp enviroment variable for windows 2011-08-13 13:11:48 +01:00
Peter 'Pita' Martischka 7ff8814fd7 added the dirty db file to gitignore 2011-08-13 13:03:07 +01:00
Peter 'Pita' Martischka 5252bee124 fixed abiword on windows 2011-08-13 13:02:27 +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 a5b84f1b6e fixed readme markdown 2011-08-12 15:08:27 +01:00