From cc2af8c5eee606c4a362dd6cd92ee70206a0ee16 Mon Sep 17 00:00:00 2001 From: Lancelot HARDEL Date: Sun, 22 Apr 2012 11:10:18 +0200 Subject: [PATCH 1/3] Added a .gitignore file --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..fa0fe3f0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Ignore data/ and tmp/ +data/ +tmp/ From e1e8792bbc99fb26096c8465d75395a9ff614ff2 Mon Sep 17 00:00:00 2001 From: Lancelot HARDEL Date: Sun, 22 Apr 2012 11:48:39 +0200 Subject: [PATCH 2/3] Markdown in README --- README.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..0093bca2 --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +ZeroBin 0.15 Alpha +=== THIS IS ALPHA SOFTWARE - USE AT YOUR OWN RISKS ==== + +ZeroBin is a minimalist, opensource online pastebin where the server +has zero knowledge of pasted data. Data is encrypted/decrypted in the +browser using 256 bits AES. + +More information on the project page: +http://sebsauvage.net/wiki/doku.php?id=php:zerobin + +------------------------------------------------------------------------------ + +Copyright (c) 2012 Sébastien SAUVAGE (sebsauvage.net) + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. + +------------------------------------------------------------------------------ From c525fb40e74b096ac9b94e6a2266432a59694169 Mon Sep 17 00:00:00 2001 From: Lancelot HARDEL Date: Sun, 22 Apr 2012 11:50:12 +0200 Subject: [PATCH 3/3] Delete first README --- README | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 0093bca2..00000000 --- a/README +++ /dev/null @@ -1,33 +0,0 @@ -ZeroBin 0.15 Alpha -=== THIS IS ALPHA SOFTWARE - USE AT YOUR OWN RISKS ==== - -ZeroBin is a minimalist, opensource online pastebin where the server -has zero knowledge of pasted data. Data is encrypted/decrypted in the -browser using 256 bits AES. - -More information on the project page: -http://sebsauvage.net/wiki/doku.php?id=php:zerobin - ------------------------------------------------------------------------------- - -Copyright (c) 2012 Sébastien SAUVAGE (sebsauvage.net) - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from -the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product documentation - would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source distribution. - -------------------------------------------------------------------------------