60 commits

Author	SHA1	Message	Date
El RIDO	720897b902	correct CSP to allow password prompt	2018-07-21 06:45:09 +00:00
rugk	60d4ccb02c	Add comment about blocked images ... Fixes https://github.com/PrivateBin/PrivateBin/issues/275	2018-07-01 14:59:24 +02:00
El RIDO	d6f203dc4c	Removed option to hide clone button on expiring pastes, since this requires reading the paste for rendering the template, which leaks information on the pastes state	2018-05-27 15:05:31 +02:00
El RIDO	caf87cc6f1	Merge branch 'master' into burnafterreading-fix, regression in expired paste error	2018-04-30 20:01:38 +02:00
El RIDO	2c82279292	Merge branch 'attachment-handling' of https://github.com/thororm/PrivateBin into thororm-attachment-handling ... apart from resolving conflicts: - added missing docs - inlined functions that were used in only one location - updated unit test to support all previews - fixed a regression that displayed the preview even when there was no preview and too early	2018-04-29 11:57:03 +02:00
rugk	9c132cd839	Disallow form-action in CSP to limit outgoing connections ... See https://github.com/PrivateBin/PrivateBin/issues/272	2018-01-06 18:06:06 +01:00
rugk	414ab0eb71	Add config and basic page template support ... * load JS file asyncronously (just HTML5 async attribut) * add basic support for page template, where it generates the code inside of a simple div at the top * added option to turn off QR code support	2017-12-25 14:59:15 +01:00
El RIDO	4ded4b7f8c	adding correct HTTP error to response, as per @rugk's recommentation	2017-10-08 16:43:46 +02:00
El RIDO	6625a9dc59	hiding INI contents from StyleCI	2017-10-08 16:26:21 +02:00
El RIDO	7197705d5c	updating unit test in preparation for planned file name change, currently failing	2017-10-08 16:25:11 +02:00

Renamed from cfg/conf.ini.sample (Browse further)