Commit graph

  • 6d47a00f29 QR code support (html) Robin Buse 2011-08-16 23:31:41 +0300
  • 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 John McLear 2011-08-16 21:29:51 +0100
  • 4aeb76cdac Reworked the start page (brighter, added top bar, font on Windows sharper), fixed some padding bugs (firefox) and compressed the js Robin Buse 2011-08-16 23:25:42 +0300
  • 5da30a40bf changed content type of api responses to application/json Peter 'Pita' Martischka 2011-08-16 20:06:59 +0100
  • d2c502e2be added deletePad API function Peter 'Pita' Martischka 2011-08-16 20:02:30 +0100
  • 783c192726 ensure password and publicStatus functions are only used with group pads Peter 'Pita' Martischka 2011-08-16 18:17:46 +0100
  • e05ec2fbf7 Merge e88805ee62 into 1151ec3278 GitHub Merge Button 2011-08-16 09:36:46 -0700
  • 1151ec3278 Merge branch 'api' of ../etherpad-lite.dev/ Peter 'Pita' Martischka 2011-08-16 17:22:15 +0100
  • e88805ee62 Edited static/css/pad.css via GitHub Robin Buse 2011-08-16 18:57:18 +0300
  • 0c6dc02bd0 Edited static/css/pad.css via GitHub Robin Buse 2011-08-16 18:55:32 +0300
  • 35cc74df27 Combined border-radius and styled the webkit scrollbar Robin Buse 2011-08-16 18:50:03 +0300
  • 3ff34f50d1 added a security control at socketiorouter, pad security is now fully enforced Peter 'Pita' Martischka 2011-08-16 15:53:09 +0100
  • 4f4c15bb07 fixed QR code content Robin Buse 2011-08-16 16:28:21 +0300
  • 563d2cae20 fixed QR code API url Robin Buse 2011-08-16 16:24:30 +0300
  • 904838ca3a QR code position fixed Robin Buse 2011-08-16 16:23:58 +0300
  • 8d0230bed5 Edited static/js/pad_editbar.js via GitHub Robin Buse 2011-08-16 16:15:36 +0300
  • 1b4e4bc48f Edited static/pad.html via GitHub Robin Buse 2011-08-16 16:12:01 +0300
  • 0c95d4a751 added qr code placeholder Robin Buse 2011-08-16 16:05:36 +0300
  • f6490d7153 added export qr code (js) Robin Buse 2011-08-16 16:03:30 +0300
  • da7ddfb5d7 fixed #84 Import bug Peter 'Pita' Martischka 2011-08-16 13:40:01 +0100
  • 30a49b2151 Edited static/css/pad.css via GitHub Robin Buse 2011-08-16 15:10:46 +0300
  • 485003f31e hover > active... Robin Buse 2011-08-16 14:59:41 +0300
  • 8c0b4bd43a button hover effect Robin Buse 2011-08-16 14:57:55 +0300
  • 7a8c3a31ea typo Robin Buse 2011-08-16 14:52:45 +0300
  • 3ffd2025a5 Edited static/index.html via GitHub Robin Buse 2011-08-16 14:50:17 +0300
  • 183185f702 Edited static/index.html via GitHub Robin Buse 2011-08-16 14:39:55 +0300
  • 21c0335737 compatibility fix Robin Buse 2011-08-16 14:31:37 +0300
  • a9f1d27267 forgot to change css file.. Robin Buse 2011-08-16 02:15:03 +0300
  • 0c5e4d89e5 transparent png css ether 2011-08-16 01:12:57 +0200
  • 7af1aa99c8 transparent png ether 2011-08-16 01:08:56 +0200
  • e433926d2f beautified code, removed unnecessary stuff and changed the color scheme a bit Robin Buse 2011-08-16 01:54:45 +0300
  • 9bc5764720 changed 'return to pad' color Robin Buse 2011-08-16 01:47:30 +0300
  • f8c5db6fc4 compressed js, redesigned custom pad form and added top bar Robin Buse 2011-08-16 01:45:01 +0300
  • 317370da2c restricted access to pad import and export Peter 'Pita' Martischka 2011-08-15 22:20:37 +0100
  • 48980f9e19 Show permission messages on the browser side Peter 'Pita' Martischka 2011-08-15 18:26:20 +0100
  • 255dc5a325 fixed merge conflicts Peter 'Pita' Martischka 2011-08-15 16:58:22 +0100
  • e24b8ac93a Merge branch 'master' of ../etherpad-lite.devmaster Peter 'Pita' Martischka 2011-08-15 16:01:30 +0100
  • 7d1dbae5e5 Add pad.css and custom/pad.css availability into the iFrame as a fix for issue 83 John McLear 2011-08-15 11:59:09 +0100
  • 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 John McLear 2011-08-15 15:00:24 +0100
  • 37a220fa87 fixed opera bug thx @johnyma22 Peter 'Pita' Martischka 2011-08-15 15:40:38 +0100
  • 793ef42704 added a error message for invalid padIDs Peter 'Pita' Martischka 2011-08-13 20:20:30 +0100
  • 0229217baf updated socket.io Peter 'Pita' Martischka 2011-08-13 20:06:38 +0100
  • 936a9985e1 use the temp enviroment variable for windows Peter 'Pita' Martischka 2011-08-13 13:11:48 +0100
  • b49123230d added the dirty db file to gitignore Peter 'Pita' Martischka 2011-08-13 13:03:07 +0100
  • da6caedb45 fixed abiword on windows Peter 'Pita' Martischka 2011-08-13 13:02:27 +0100
  • 10c2497fcc Allow cross site export John McLear 2011-08-14 14:47:41 +0100
  • b300dc1d2c fixed merge conflicts Peter 'Pita' Martischka 2011-08-13 22:18:42 +0100
  • db3ee19ced Added support for monospace font to be passed as a parameter in the URL John McLear 2011-08-13 22:10:58 +0100
  • d0e378f63a added a security manager to control pad access on group pads Peter 'Pita' Martischka 2011-08-13 22:07:21 +0100
  • 4b77dd8c7a Beginning of a show chat history function John McLear 2011-08-13 21:59:12 +0100
  • 4730c3b46e added a error message for invalid padIDs Peter 'Pita' Martischka 2011-08-13 20:20:30 +0100
  • 2b266ee82a updated socket.io Peter 'Pita' Martischka 2011-08-13 20:06:38 +0100
  • 0384f677b9 Merge branch 'master' of /home/jose/etherpad-lite/ Peter 'Pita' Martischka 2011-08-13 19:54:16 +0100
  • bba9cd515b Added support for changing username from the URL ie ?userName=JohnMcLear -- doesnt urldecode etc. needs checking for vulnerabilities too John McLear 2011-08-13 19:53:02 +0100
  • fd4bdeccb3 Merge branch 'master' of /home/jose/etherpad-lite/ Peter 'Pita' Martischka 2011-08-13 19:05:20 +0100
  • 7f28889660 Removed my cake commit that I used as a placemarker John McLear 2011-08-13 18:38:00 +0100
  • 8db0c12bbe Add support for removing line numbers using the jQuery API and stopped it publishing that change back if the param is set John McLear 2011-08-13 18:37:44 +0100
  • 3c99e07030 fixed regular expression PadID check Peter 'Pita' Martischka 2011-08-13 17:48:36 +0100
  • 3a77d96c98 use the temp enviroment variable for windows Peter 'Pita' Martischka 2011-08-13 13:11:48 +0100
  • 7ff8814fd7 added the dirty db file to gitignore Peter 'Pita' Martischka 2011-08-13 13:03:07 +0100
  • 5252bee124 fixed abiword on windows Peter 'Pita' Martischka 2011-08-13 13:02:27 +0100
  • fb593c1d5c Began adding support for passing parameters via the URL and removed a location redirect that was no longer needed John McLear 2011-08-12 16:00:09 +0100
  • a5b84f1b6e fixed readme markdown Peter 'Pita' Martischka 2011-08-12 15:08:27 +0100
  • 8deb853be6 updated node for windows to 0.5.4 Peter 'Pita' Martischka 2011-08-12 15:03:01 +0100
  • f808135201 added Windows installation instructions Peter 'Pita' Martischka 2011-08-12 14:57:24 +0100
  • 53cdd893af added a buildForWindows script Peter 'Pita' Martischka 2011-08-11 22:00:52 +0100
  • 0e05e58c76 changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd) Peter 'Pita' Martischka 2011-08-11 15:26:41 +0100
  • 38801fa3b2 added a ugly favicon, to motivate people creating a better one ;) Peter 'Pita' Martischka 2011-08-11 15:16:26 +0100
  • 4b892ae4ff check node and npm version on install Peter 'Pita' Martischka 2011-08-11 15:09:05 +0100
  • 39bc588ae7 Improved the readme a bit Peter 'Pita' Martischka 2011-08-11 14:46:25 +0100
  • 9cc3b543cc Merge branch 'master' of git://github.com/Pita/etherpad-lite into api Peter 'Pita' Martischka 2011-08-10 22:47:50 +0100
  • ce1012438e added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected Peter 'Pita' Martischka 2011-08-10 22:33:31 +0100
  • 292c68a0a5 harmonize different ID types, improved the prefixes Peter 'Pita' Martischka 2011-08-10 14:24:21 +0100
  • f6b87daa27 added deleteSession Peter 'Pita' Martischka 2011-08-10 14:04:28 +0100
  • dc15682a27 changed name of getMapped*4 functions to create*IfNotExistsFor Peter 'Pita' Martischka 2011-08-10 12:38:03 +0100
  • 578f8db311 improved test.html Peter 'Pita' Martischka 2011-08-10 12:12:29 +0100
  • 9f530962ee Add js tests to assist with api development Randy 2011-08-09 16:51:33 -0700
  • 3c46cce341 some small design changes Peter 'Pita' Martischka 2011-08-10 18:26:12 +0100
  • 13c10013b9 do the chat resize without hiding the pad text Peter 'Pita' Martischka 2011-08-10 18:18:50 +0100
  • d812557445 fixed #73 Peter 'Pita' Martischka 2011-08-10 18:06:22 +0100
  • 0e4a54328a fixed #61 Peter 'Pita' Martischka 2011-08-10 17:48:36 +0100
  • dc10985ba3 beautify exporthtml Peter 'Pita' Martischka 2011-08-10 17:31:20 +0100
  • 33ec98dd35 beauty Peter 'Pita' Martischka 2011-08-10 17:24:59 +0100
  • c4ac1babe8 removed unused images Peter 'Pita' Martischka 2011-08-10 17:23:38 +0100
  • ba9861382e fixed the design Peter 'Pita' Martischka 2011-08-10 17:19:23 +0100
  • d66675914c Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout Peter 'Pita' Martischka 2011-08-10 16:19:02 +0100
  • 9178594f2e Add js tests to assist with api development Randy 2011-08-09 16:51:33 -0700
  • 70f51ae660 Merge pull request #75 from snarkyMcSnark/patch-1 Peter 'Pita' Martischka 2011-08-09 14:48:23 -0700
  • beadbb257d Merge ff15820bd7 into f5b06b0d25 GitHub Merge Button 2011-08-09 14:45:10 -0700
  • ff15820bd7 a few spelling mistakes snarkyMcSnark 2011-08-09 16:44:33 -0500
  • 183d1597c6 clean up Peter 'Pita' Martischka 2011-08-09 20:22:39 +0100
  • dbf9dc6dfb added listSessionsOfGroup and listSessionsOfAuthor Peter 'Pita' Martischka 2011-08-09 20:14:32 +0100
  • 4b48380a2f added createSession and getSessionInfo Peter 'Pita' Martischka 2011-08-09 16:45:49 +0100
  • f01906d815 added getMappedAuthor4 Peter 'Pita' Martischka 2011-08-09 14:42:12 +0100
  • e336b4f940 added create Author Peter 'Pita' Martischka 2011-08-09 12:09:04 +0100
  • e6ba60bddc cleaned up authormanager Peter 'Pita' Martischka 2011-08-09 11:55:12 +0100
  • a850de5532 Merge branch 'master' of .git into api Peter 'Pita' Martischka 2011-08-09 11:14:18 +0100
  • f5b06b0d25 Ops, fixed the folder remove Peter 'Pita' Martischka 2011-08-09 11:14:09 +0100
  • 1a824bd130 Merge branch 'master' of .git into api Peter 'Pita' Martischka 2011-08-09 11:08:27 +0100
  • 04ec7658e1 remove node_modules folder when the installation fails, prevents from broken dependencies Peter 'Pita' Martischka 2011-08-09 10:58:43 +0100