Commit Graph

339 Commits

Author SHA1 Message Date
El RIDO 2ca2309fc4
Merge branch 'patch-1' of https://github.com/r4sas/PrivateBin into r4sas-patch-1 2017-02-06 19:55:07 +01:00
rugk 86cd5e1c15
Use existing reload function 2017-02-05 22:35:44 +01:00
rugk edb546de54
Add loading indicator
Fixes https://github.com/PrivateBin/PrivateBin/issues/172
2017-02-05 22:09:46 +01:00
rugk c96dd0836b
Make link clickable again
We need to emulate the click and manually trigger a reload if the hash is
already shown in the URL.
2017-02-05 21:22:09 +01:00
El RIDO 366b61c32d
adding document title in new history state 2017-02-05 18:53:57 +01:00
El RIDO f699ca6cd4
writing tests for htmlEntities function 2017-02-05 18:46:24 +01:00
El RIDO 5442af6e20
slight JS refactoring 2017-02-05 14:47:03 +01:00
rugk ca51a80803
Update the history when a paste is created
Fixes https://github.com/PrivateBin/PrivateBin/issues/167
2017-02-01 19:24:56 +01:00
El RIDO 4bbfd5045e
ensure that JS is *really* only initialized after the DOM is fully loaded, resolves #166 2017-01-30 20:29:04 +01:00
El RIDO b76a73aa06
upgrading showdown 2017-01-29 16:17:56 +01:00
El RIDO f1df27f46c
allowing for parameter strings starting with & 2017-01-29 15:09:57 +01:00
El RIDO 177c9d7114
Merge branch 'js-unit-testing' 2017-01-29 14:50:31 +01:00
El RIDO cae5a71151
fix missing class renaming 2017-01-29 14:48:56 +01:00
El RIDO efcfb80129
Merge branch 'master' of github.com:PrivateBin/PrivateBin 2017-01-29 14:39:34 +01:00
El RIDO d678f5dada
fixing inconsistency found in unit test 2017-01-29 14:32:55 +01:00
El RIDO abaf8e96a6
updated page template 2017-01-24 19:27:35 +01:00
Nathaniel Olsen a005b1128b Updated showdown 2017-01-23 22:49:03 -06:00
Nathaniel Olsen 47e4478e17 Updated sjcl, bootstrap, and the hashes 2017-01-23 22:42:05 -06:00
El RIDO 8029c2819f
implementing JS module pattern to expose functions for unit testing 2017-01-22 10:42:11 +01:00
El RIDO 5f09264625
fixing documentation inconsitencies found by Scrutinizer CI 2017-01-14 16:13:22 +01:00
El RIDO db2778c64f
introduced JSDoc: changes for JSDoc compatibility and resolving inconsistencies in documentation, both semantic and in the logic 2017-01-14 15:29:12 +01:00
El RIDO a7de0e095b
added supported language, updated credits and changelog 2017-01-10 20:37:14 +01:00
El RIDO 7f4ed739de
moved images to img folder 2017-01-08 10:13:12 +01:00
El RIDO 67f6c4eb61
turned bootstrap template variants into logic 2017-01-08 10:02:07 +01:00
El RIDO 87fad1fb77
DRYed templates 2017-01-08 09:40:13 +01:00
El RIDO f79c00378b
Choosing correct Occitan plural formula, added unit tests for Occitan and Chinese, corrected casing of languages in unit test 2017-01-08 07:56:56 +01:00
rugk 20fea819cb
Update SRI hashes 2017-01-07 20:35:47 +01:00
El RIDO a5d91298ff
add an option to change the site name, solves #154 2017-01-01 16:33:11 +01:00
El RIDO 4a036aea80
updated SRI hashes, added missing formula for slowene plurals and unit test for it, updated credits and changelog 2017-01-01 14:35:39 +01:00
El RIDO 1426d4e371
tagging 1.1 release and updating documentation 2016-12-26 12:13:50 +01:00
El RIDO 1badd5e542
applying HTML entity cleanup to raw paste, too, fixing #137 2016-12-25 13:04:06 +01:00
El RIDO ecd8a51137
writing a unit test for #145 lead to the discovery of two errors in the polish translations: error in formula and missing number placeholders in the translation strings 2016-12-25 11:37:45 +01:00
r4sas aacfe8e5fa added a forgotten option 'ru' in supportedLanguages section 2016-12-19 17:26:04 +03:00
atnaguzin 2847bbc45d added ru plural formula, updated template for edited privatebin.js 2016-12-16 12:21:15 +03:00
rugk 90e0bf6058
Merge branch 'tables' 2016-12-14 19:03:58 +01:00
rugk 58bd603c7c
Use nice condensed table with border
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01:00
rugk 67094022dd
Remove code duplication 2016-12-12 19:29:29 +01:00
rugk bdf1586539
Add FAQ link & add to all templates 2016-12-12 18:37:54 +01:00
rugk f755a99ab8
Add table class to parsed Markdown
Fixes https://github.com/PrivateBin/PrivateBin/issues/140
2016-12-12 17:37:51 +01:00
El RIDO b94d252421
Merge branch 'master' into JSnotWorkingError 2016-11-13 18:30:14 +01:00
El RIDO 3f2de319f3
should use typesafe comparison in JS and adding forgotten modal dialog in bootstrap-dark-page 2016-11-13 18:22:37 +01:00
El RIDO 3f8d6a592b
refactored modal dialog logic, added the new message IDs to all translation files and added the modal dialog to all bootstrap based templates (page gets the old JS input as a fallback) 2016-11-13 18:12:10 +01:00
El RIDO 9dcdb3172c
added translation string to JSON files, removed unneccessary class (already covered by bootstrap CSS) and moved noscript CSS load into head (allowed when not using XHTML) 2016-11-13 12:27:09 +01:00
Alexander Demenshin 1b0095b54a Added localization for modal password dialog 2016-11-13 00:42:52 +01:00
Alexander Demenshin 1c643191ce Updated intergrity hash for privatebin.js 2016-11-12 18:32:39 +01:00
Alexander Demenshin 6544fc8a49 Proper indenting and fix for "label for" 2016-11-12 18:21:33 +01:00
Alexander Demenshin e8248020dd Updated integrity hash 2016-11-11 18:53:35 +01:00
Alexander Demenshin c1ca5657b5 Removed unnecessary attributes from modal password form 2016-11-11 18:41:41 +01:00
Alexander Demenshin 0fbeefb199 Added modal decryption password request 2016-11-11 18:28:20 +01:00
rugk 64e1e0d7c4
Merge branch 'master' 2016-10-31 12:20:29 +01:00
rugk f9149595c9
Change alert to loading info message 2016-10-31 12:20:07 +01:00
El RIDO 375dac759f
renamed jQuery file to match projects JS file naming convention 2016-10-29 12:18:03 +02:00
El RIDO f093b05330
update jQuery from 1.11.3 to 3.1.1 2016-10-29 12:12:22 +02:00
rugk 7bbb273c1c
Add "JS not working" error message
It is:
* hidden by JS code executed as early as possible
* not hidden by noscript tags, so that it is *not* shown when JavaScript is just no activated

Fix https://github.com/PrivateBin/PrivateBin/issues/103
2016-10-25 21:13:43 +02:00
rugk 5d822af5b1
Regenerate JS hashes & sign commit 2016-10-25 19:03:20 +02:00
Nathaniel Olsen 63a6ecb922 Now using the minimal version of jQuery 2016-10-21 17:06:22 -05:00
Nathaniel Olsen 0a48c464b4 Update jquery 1.11.3 ==> 3.1.1 2016-10-21 10:31:56 -05:00
rugk 1a159c973f
Prevent referrer to be send
Uses both CSP and Referrer-Policy
Fixes #96
2016-09-03 18:12:24 +02:00
El RIDO e925833090 bumping version number to 1.0 2016-08-25 09:53:31 +02:00
El RIDO 1907586b39 changing link to project page 2016-08-22 09:50:28 +02:00
rugk 5621f32752 Readd icon instead of logo for header
Continues #87
2016-08-21 16:51:54 +02:00
rugk f7a75a9d33 Merge branch 'master' into newicon 2016-08-20 19:09:39 +02:00
rugk d7896fbd95 Fix header link in subdir installations
Now this does link to PrivateBin and not to the top-root (file) of the webserver
2016-08-20 18:53:07 +02:00
rugk 8f19045b58 Replace icon with logo with text 2016-08-20 18:01:52 +02:00
El RIDO 47646e056b fixing urlshortening regression caused by CSP introduction, resolves #10 2016-08-18 15:09:58 +02:00
El RIDO f72e260ee7 adding subresource integrity hashes for all javascript includes, resolves #6 2016-08-16 11:11:03 +02:00
El RIDO b94d2f2295 resolving a few spacing issues in the templates 2016-08-15 14:24:42 +02:00
rugk eee2505a03 PR #56 was broken
This fixes the display now finally.
2016-08-10 20:20:36 +02:00
El RIDO addb666a23 introducing CSP header to mitigate XSS attacks, closes #10 2016-08-09 14:46:32 +02:00
El RIDO b45bef8388 Renamed classes for full PSR-2 compliance, some cleanup 2016-08-09 11:54:42 +02:00
Sobak 5d7003ecc1 Convert to PSR-2 coding style (using phpcs-fixer) 2016-07-26 08:19:35 +02:00
Sobak 54f96b9938 Introduce PSR-4 autoloading 2016-07-22 12:11:48 +02:00
rugk d58eb13bfd Use SVG icon instead of PNG version if possible 2016-07-19 14:30:44 +02:00
El RIDO c5606a47fe refactoring away RainTPL and templating, resolves #36 2016-07-19 14:02:26 +02:00
rugk d485ab2d88 Use HTTPS for browser links & add Edge 2016-07-19 13:33:51 +02:00
rugk 1923039f75 Make favicons subdirectory-compatible 2016-07-19 13:08:48 +02:00
El RIDO c3a114d923 fixing favicon includes in templates, thanks @rugk for spotting it 2016-07-19 08:53:32 +02:00
El RIDO 6b20836461 upgrading SJCL library to 1.0.4: https://github.com/bitwiseshiftleft/sjcl/releases/tag/1.0.4 2016-07-18 16:54:33 +02:00
El RIDO c851dfff5f freeing up space in bootstrap layouts by using logo instead of brand name 2016-07-18 16:39:43 +02:00
El RIDO a5c10aac8a replacing favicons with new design by @rugk, resolves #23 2016-07-18 16:25:06 +02:00
El RIDO 8f2d43722b fixing wrong project URL 2016-07-11 16:31:10 +02:00
El RIDO 3b3b5277eb refactoring to improve code quality 2016-07-11 14:15:20 +02:00
El RIDO 79509ad48a renaming the fork to PrivateBin 2016-07-11 11:58:15 +02:00
El RIDO 6a663ba07f adding preview feature, resolves #4 2016-07-11 11:09:41 +02:00
El RIDO 87fb3f5d2f implementing @k0nsl suggestion regarding wording, resolves #110 2016-07-08 08:56:42 +02:00
El RIDO 1625aac798 updating showdown library, adding support for tables and strikethrough,
fixing issue with double escaping HTML entities that was causing
blockquotes to be ignored, fixes #75
2016-05-22 16:18:57 +02:00
El RIDO ff3154316c Sometimes simple solutions are the cleanest. Resolves #51, resolves #72. 2016-04-26 20:32:48 +02:00
El RIDO a4ebdbc606 re-introducing (optional) URL shortener support, resolves #58 2016-01-31 09:56:06 +01:00
Adam Fisher 0997520c1d Add favicon
Conflicts:
	tpl/page.html
2015-11-29 17:50:50 +01:00
El RIDO 2dc4422a27 separating the dark bootstrap theme in to two variants regarding the
new/send button placements
2015-11-16 20:06:06 +01:00
El RIDO 9d27e7a65d added dark bootstrap theme, resolving #47 2015-10-31 20:56:55 +01:00
El RIDO ca07398b66 adding option to hide clone button on expiring pastes, resolves #34 2015-10-18 17:56:45 +02:00
El RIDO 5d61b90d6b Changing template as per issue #35 2015-10-14 20:43:51 +02:00
El RIDO 0686087cfd fixing mobile navbar triggered issue and slight adjustement to bootstrap
template for using full width of browser for navbar
2015-09-20 20:05:48 +02:00
El RIDO a41d0ca4dd various fixes:
- changing default formatter option to plain text to make upgrading from
  0.19 Alpha smoother
- fixing translation message change in bootstrap templates
- adjusting how image uploads are displayed in bootstrap templates
2015-09-19 14:22:29 +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 e144739dec implement file upload UI on bootstrap templates 2015-09-18 10:49:39 +02:00
El RIDO 8de24fae67 small visual adjustement on bootstrap theme 2015-09-18 09:52:04 +02:00
El RIDO 9274564162 intermediate step for #28: revert bootstrap template, but ensuring that
the navbar does not overlap by removing its float on top property.
bootstrap-compact is now the template with the floating & always visible
navbar.
2015-09-18 09:31:17 +02:00
El RIDO f25661beda Working on #28, changing template to avoid multi-line navbar:
- moved "burn after reading" & "discussion" into "options" menu in
"bootstrap" template
- added seperate "bootstrap-compact" template that also moves the
  formats into the same "options" menu
- fixing horizontal scroll bar glitch in mobile navbar
2015-09-17 21:55:28 +02:00
El RIDO 106141efa4 merging @vikstrous file upload feature for #20 from
8a6d268278
2015-09-16 22:51:48 +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 da42968d7c "New" button became untapable in the mobile nav bar. Now it looks a bit
more ugly (it is at the end of the menu) but at least can be tapped on
again.
2015-09-12 10:10:30 +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
El RIDO a2af88a36e initial work on translations, covering the PHP side of it 2015-09-05 02:24:56 +02:00
El RIDO 3edeefd799 change project homepage link in templates 2015-09-03 23:51:42 +02:00
Hexalyse 9611e0ec4f The default expiration time of the paste is now also displayed before we select an expiration time. 2015-09-01 14:19:03 +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 1009491721 Fixed bug of password input not displaying on bootstrap theme 2015-08-30 14:46:43 +02:00
Hexalyse f2532f8310 Changed ids in HTML 2015-08-30 14:44:46 +02:00
Hexalyse 2c8f5a0566 Added password field on bootstrap theme 2015-08-30 14:43:01 +02:00
Hexalyse fa273a3429 Added password field on bootstrap theme 2015-08-30 14:36:40 +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
Simon Rupf a34cc562e1 optimized bootstrap comment layout 2015-08-23 15:52:25 +02:00
Hexalyse 2aa71708e2 Corrected display of password field 2015-08-22 17:27:43 +02:00
Hexalyse 89bfc2ffe0 Merge remote-tracking branch 'origin/master' 2015-08-22 17:24:03 +02:00
Hexalyse 3b537eda40 Added an optional password protection 2015-08-22 17:23:41 +02:00
Hexalyse 02964aa936 changed button color when Open discussion is disabled 2015-08-22 17:01:14 +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 3a183470a6 included sons of obsidian prettify template, since the new default one is a bit bleak 2015-08-16 15:52:46 +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 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 e646729b2d fixing regressions from cherrypicking 2015-08-15 21:39:08 +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 8435b9ab3a Added version to js/css assets URLs.
(in order to prevent some abusive caches to serve an obsolete version of
these files when ZeroBin is upgraded.)

(cherry picked from commit 889eba47962771c612692d1d8028258804605563)

Conflicts:
	tpl/page.html
2015-08-15 18:37:51 +02:00
Sebastien SAUVAGE 5b253cf77c ZeroBin 0.17
* added deletion link.
* small refactoring.
* improved regex checks.
* larger server alt on installation.
2013-11-01 01:15:14 +01:00
Simon Rupf d247bff897 syntax highlighting can now be turned off, template can be changed in
configuration
2013-10-31 22:24:40 +01:00
Simon Rupf 630e16c4a0 Added more configuration options, based on patch by Uli Köhler 2013-10-30 23:54:42 +01:00
Simon Rupf 2470871e70 add robots meta tag, in case we are not installed in the root
folder of a domain or subdomain. fixes #2
2012-09-08 13:24:39 +02:00
Simon Rupf 2d4f155064 had to revert to HTML5 instead of XHTML5 because of compatibility
problem with code prettifier, fixed some display bugs
2012-08-28 23:28:41 +02:00
Simon Rupf 907538875b removed leftovers from submodule uglifyjs, added credits file,
cleaned up CSS, changed template to output clean XHTML 5,
added unit tests for 60% of the code, found a few bugs by doing
that and fixed them
2012-08-26 00:49:11 +02:00
Simon Rupf 421e6cba97 implemented zerobin_db model, added more options for paste expiration, made comments and max data size configurable 2012-05-19 23:59:41 +02:00
Alexey Gladkov 0057045f51 Add syntax highlighting
Syntax highlighting is done with the use of the library:

http://code.google.com/p/google-code-prettify/

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
2012-04-29 20:27:00 +04:00
Thierry Poinot 6083c7a23c refactoring files and directory structure 2012-04-22 13:34:17 +02:00
Sebastien SAUVAGE 52630374e5 Initial commit of version 0.15 alpha. 2012-04-21 21:59:45 +02:00