Commit Graph

63 Commits

Author SHA1 Message Date
El RIDO
608605cd54 incrementing version number, updating docs 2015-09-19 17:23:10 +02:00
El RIDO
844c4d15e9 fixes #30 2015-09-19 14:19:42 +02:00
El RIDO
a111357fae add optional (since it uses a session cookie) language selection 2015-09-19 11:21:13 +02:00
El RIDO
39e865ca64 if the uploaded file is an image mime type, display it 2015-09-18 21:41:50 +02:00
El RIDO
50075ea948 fixing issue with attachment, empty paste & empty password 2015-09-18 20:25:53 +02:00
El RIDO
ed9c4f45f4 adding file name support for #20, solving issue with unencryptable file 2015-09-18 12:33:10 +02:00
El RIDO
e144739dec implement file upload UI on bootstrap templates 2015-09-18 10:49:39 +02:00
El RIDO
106141efa4 merging @vikstrous file upload feature for #20 from
8a6d268278
2015-09-16 22:51:48 +02:00
El RIDO
61903665df logic cleanup 2015-09-16 20:49:28 +02:00
El RIDO
0e53d1ee86 added markdown support and a dropdown for the format selection. The
options other then markdown are plain text and source code (syntax
highlighting). Resolves #25
2015-09-12 17:33:16 +02:00
El RIDO
9dde7f034a moving remaining time / for your eyes only message from nav bar into
status alert in bootstrap theme, to ensure it is seen even with a
collapsed nav bar as in the mobile view
2015-09-12 10:38:04 +02:00
El RIDO
428a9d9c41 toggling mobile nav bar after tap on buttons "New", "Clone" and "Send"
to ensure any messages are visible for #21.
2015-09-12 10:23:12 +02:00
El RIDO
b26fb08732 Fixing issues with en translation, thanks @wware for spotting it 2015-09-08 20:48:18 +02:00
El RIDO
b060d57524 - implemented php side of plural translation
- using it to generate labels dynamically for the expire options
(deprecating the [expire_labels] configuration).
- added translation of the human readable data sizes to support the
french octet
- fixed IEC label for kibibytes
2015-09-06 19:21:17 +02:00
El RIDO
c83ba8256f implementing a plural translation solution, currently only the JS part 2015-09-06 15:54:43 +02:00
El RIDO
eee7b0144a covering JS side of translations (#7), added the messages to the
translation files and translated the german ones
2015-09-06 13:07:46 +02:00
El RIDO
b883d5eb4c Merge branch 'master' of git@github.com:elrido/ZeroBin.git
Conflicts:
	js/zerobin.js
2015-09-05 17:21:05 +02:00
El RIDO
3099e10dfa refactored JS:
- moved from global namespace into anonymous function
- as onclick has no direct access to the zerobin methods, the events are
now bound in the init() method via bindEvents()
- to simplify maintenance, the functions were wrapped into 3 objects:
zerobin (display logic, event handling), filter (compression,
encryption) and helper (stateless utilities)
- some CSS and template adjustements were also done
2015-09-05 17:12:11 +02:00
Hexalyse
d74172064b Hide error message when paste is posted correctly 2015-09-05 14:45:50 +02:00
Hexalyse
9687144c92 Error messages are now replaced and not appended
Error messages are now replaced and not appended in the #errormessage div, without removing the glyphicon (which a .text() would have done).
This way, we don't have HTML code in the JS (which would be ugly). But it's still not a really elegant solution.
2015-09-05 14:38:53 +02:00
El RIDO
2d79ba8243 updating docs, bumping version to 0.20 2015-09-03 22:22:59 +02:00
El RIDO
b25022e403 refactored JSON API, its now possible to retrieve pastes as JSON, which
is now used when posting comments, eliminating the need to store the
password in sessionStorage
2015-09-01 22:33:07 +02:00
El RIDO
802a0b26b9 burn after reading messages are only deleted after callback by JS when
successfully decrypted, resolves #11
2015-08-31 22:10:41 +02:00
El RIDO
9fdbba76ce working on password function for #15:
- asking again if password is wrong
- display error if user cancels dialog
- use password to encrypt comments, too (password is "stored" in the
password field)
- store password in sessionStorage when posting a comment so, that it
doesn't have to typed in again, but clear sessionStorage as soon as
password is retrieved
2015-08-31 21:14:12 +02:00
El RIDO
d3c4600806 slight configuration changes, template modifications to make discussions
and password configurable, removed generated configuration test as it
grows quite big and a new one can be generated easily if needed
2015-08-31 00:01:35 +02:00
Hexalyse
0198371049 Password input id change in zerobin.js 2015-08-30 15:06:32 +02:00
Hexalyse
eadcd60e14 Password input id change in zerobin.js 2015-08-30 15:05:50 +02:00
Hexalyse
95f1db925b Merge branch 'master' of https://github.com/elrido/ZeroBin
Conflicts:
	cfg/conf.ini
	js/zerobin.js
2015-08-30 14:33:09 +02:00
El RIDO
be91afa042 - fixing JS errors when syntax highlighting is disabled (point 1. #15)
- fixing missing url conversion in highlighted text (point 2. # 15)
2015-08-27 23:58:28 +02:00
Simon Rupf
a34cc562e1 optimized bootstrap comment layout 2015-08-23 15:52:25 +02:00
Hexalyse
3b537eda40 Added an optional password protection 2015-08-22 17:23:41 +02:00
El RIDO
b299a6e03e added a bootstrap theme, still needs some work in the comments layout 2015-08-17 23:19:15 +02:00
El RIDO
0c1d5c62d5 updated de/inflate to versions 0.5/0.3, using versions found at
a3725d3bee
kudos Dan Kogai
2015-08-16 13:02:27 +02:00
El RIDO
a0107d7eae updated prettify to minified versions found at
6aa04af68e/loader/prettify.js
6aa04af68e/loader/prettify.css
kudos Mike Samuel
2015-08-16 12:46:01 +02:00
El RIDO
49c6e3c1b6 updated base64.js to version 2.1.9, using minified version found at
9192c510f5/base64.min.js
kudos Dan Kogai

small improvements to input checking
implementing default values for most configuration options
switching to versioned JS files to avoid version hack used in template
2015-08-16 12:27:06 +02:00
El RIDO
7bc8c14df6 updated sjcl to version 1.0.2, using minified version found at
11a673d1d3/sjcl.js
kudos Nils Kenneweg
2015-08-16 11:29:01 +02:00
El RIDO
769768d25e updated jquery to 1.11.3 2015-08-16 11:20:06 +02:00
El RIDO
3aa4911991 Small text message changes 2015-08-16 01:56:39 +02:00
Sebastien SAUVAGE
daf5522b1e Potentiel security bug corrected
Bug reproduction: 1) paste texte containing html/javascript. 2) send 3)
clic "Raw text"  4) refresh: The html/javascript is interpreted instead
of just displayed.
Under some versions of Chrome, it happens without refreshing.
This bug was corrected.

(cherry picked from commit 4f8750bbddcb137213529875e45e3ace3be9a769)
2015-08-15 22:24:25 +02:00
Sebastien SAUVAGE
bc8b23d35e XSS flaw correction
With a client IE < 10 there was a XSS security flaw. Other browsers were
not affected.
Also corrected spacing display with IE<10.

(cherry picked from commit 28813cd82ae47e556b610da3c7302a6709e27431)

Conflicts:
	CHANGELOG.md
	index.php
	js/zerobin.js
	lib/vizhash16x16.php
2015-08-15 22:01:43 +02:00
Sebastien SAUVAGE
d9930978ba Make sure there is enough entropy.
This patch will improve key randomness by requiring the user to move the
mouse if there is not enough entropy.

(cherry picked from commit c6e98045aa833dff824f892eb3392744c03a59f7)
2015-08-15 21:52:14 +02:00
El RIDO
e646729b2d fixing regressions from cherrypicking 2015-08-15 21:39:08 +02:00
Sebastien SAUVAGE
5f87ea6843 ZeroBin 0.18
(cherry picked from commit 7a8cbee2f99cd74a50bce7e8df8130e2c477d903)

Conflicts:
	CHANGELOG.md
	index.php
	js/zerobin.js
	lib/vizhash16x16.php
2015-08-15 21:06:19 +02:00
Sebastien SAUVAGE
ecd2e067f8 replaceState() changed to pushState()
so that the "Back" button works after clicking on "Raw text".

(cherry picked from commit 47fae2b2467df2ab017102d82833cb380c286867)
2015-08-15 20:26:25 +02:00
Sebastien SAUVAGE
fdc87a7fcf Added "Raw text" button.
(cherry picked from commit 00cfcafc996c55afd069b665ad3875693e22d36d)

Conflicts:
	css/zerobin.css
	js/zerobin.js
	tpl/page.html
2015-08-15 20:25:46 +02:00
Sebastien SAUVAGE
09bebae286 Removed dead code.
(cherry picked from commit 87e17b36f9b2ec777c14257eb9c8efec0e7bd053)

Conflicts:
	css/zerobin.css
	js/zerobin.js
	tpl/page.html
2015-08-15 20:06:44 +02:00
Sebastien SAUVAGE
cff4d99f05 "Burn after reading" as a checkbox
"Burn after reading" option has been moved out of Expiration combo to a
separate checkbox.
Reason is: You can prevent a read-once paste to be available ad vitam
eternam on the net.

(cherry picked from commit 190b278402c086ebc4d1a78aae27d1e2666e3e7a)

Conflicts:
	css/zerobin.css
	index.php
	js/zerobin.js
	tpl/page.html
2015-08-15 19:01:03 +02:00
Sebastien SAUVAGE
1b95d6fff7 base64.js downgraded from 2.6 to 1.7
because otherwise it would have broken compatibility with data files.

(cherry picked from commit 75a27b6243b8cffa69f59c068dac61263574dc5b)
2015-08-15 18:39:47 +02:00
Sebastien SAUVAGE
eccd4a816a base64.js updated to 2.6
From https://github.com/dankogai/js-base64

(cherry picked from commit 7e5c36ed5b7fc67ba919973834e015ce92b5708b)
2015-08-15 18:33:58 +02:00
Sebastien SAUVAGE
315c45ed0c Auto-select paste URL
When creating a paste, we auto-select the resulting URL so that the user
only has to press CTRL+C to copy the link.
So you basically click "SEND" then press CTRL+C.

(cherry picked from commit 3feb4641c7892eeeaff2fe61c6e153919687b9c6)

Conflicts:
	css/zerobin.css
2015-08-15 16:56:11 +02:00