1bf910480b
Do not show error, when paste is deleted manually
...
Prior to this commit, if the paste has been deleted manually (clicking
on "delete paste" after creation) it tried to fetch the now deleted
paste and display an error. This makes, of course, no sense.
2018-05-22 11:41:35 +02:00
626b4450e3
Merge branch 'master' into burnafterreading-fix
2018-05-22 10:57:30 +02:00
733cc70967
Improve code style of function names
...
Thx
429d43dc78 (r29068381)
2018-05-22 10:19:53 +02:00
429d43dc78
Make some functions of AttachmentHandler private
...
They are only used/referenced in the same module, so there is no need to
make them public.
2018-05-22 00:43:24 +02:00
14a7fd7091
Fix https://github.com/PrivateBin/PrivateBin/issues/315
...
Fixes some display issues related to file display.
2018-05-22 00:41:02 +02:00
da45d347e2
Fix attachment issues
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/315
The attachment viewer is also used for storing to be uploaded
attachments, which caused some confusion in handling them.
I also tried to add some comments clarifying it as it seems to work.
Additionally I fixed the issue that you could submit an empty paste and
it was not rejected.
2018-05-21 19:32:01 +02:00
caf87cc6f1
Merge branch 'master' into burnafterreading-fix, regression in expired paste error
2018-04-30 20:01:38 +02:00
b618bad51c
minor fix
2018-04-30 18:26:33 +02:00
1648780269
Fix bootstrap template
2018-04-30 05:45:40 +00:00
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
de4b96c5ed
Merge branch 'blob' of https://github.com/otaku/PrivateBin into otaku-blob
2018-04-29 10:28:40 +02:00
e4bf41202e
Merge branch 'master' into js-unit-testing
2018-04-29 08:53:59 +02:00
5bee666a6b
Update SRI hashes
2018-04-09 16:40:10 +00:00
09a04b96c0
Update SRI hashes
2018-04-08 23:09:13 +02:00
78c186d6bc
avoid StyleCI complaint
2018-03-04 13:19:49 +01:00
0938b59b90
attributes contain strings, not booleans
2018-03-04 11:47:58 +01:00
76debde85b
found and fixed a bug in TopNav.collapseBar() while writing test for it
2018-03-03 07:55:27 +01:00
ce6764e97d
introduce built in asserts, working on TopNav, correcting some docs
2018-03-01 06:43:30 +01:00
cb2af8687e
Merge branch 'master' into js-unit-testing
2018-02-25 10:20:07 +01:00
4653085d2e
Merge branch 'master' into fixurlshortener
2018-02-25 10:10:05 +01:00
d07f8d8f96
fixing indentation, replicating change to other template
2018-02-25 10:09:19 +01:00
266b71bfd0
Merge branch 'master' into js-unit-testing
2018-02-25 09:51:49 +01:00
a3e0418b33
working on TopNav tests
2018-02-25 09:45:51 +01:00
0687448d0a
Fix some issues from ESLint
2018-02-21 22:51:31 +01:00
904f0de245
Fix indendation
2018-02-21 22:31:01 +01:00
722d8ce7dd
Fix URL shortener not working
...
Move URL shortener out of #pastelink as that is overwritten by the JS.
Fixes https://github.com/PrivateBin/PrivateBin/issues/280
2018-02-21 22:28:56 +01:00
ffae6111b0
handling further JSHint warnings and TODOs
2018-01-06 13:32:07 +01:00
98d07e0789
improving code quality issues reported by Codacy
2018-01-06 10:57:54 +01:00
d92755f030
undoing code style regression
2018-01-06 09:58:19 +01:00
72acc95326
improving code quality issues suggested by JSHint
2018-01-06 09:26:10 +01:00
5e070db6a1
reverting escaping just for Markdown formatting, as discussed in #269
2018-01-03 21:18:33 +01:00
a95701bba8
completing DiscussionViewer testing
2018-01-02 15:38:37 +01:00
85401a1513
Merge branch 'master' into js-unit-testing
2018-01-02 09:37:46 +01:00
6ce0fe55f6
revert as per StyleCI: missed one
2018-01-02 08:41:45 +01:00
f135dd2667
Hrmpf, StyleCI only allows the use of either tabs or spaces for PHP code, forcing me to revert the use of tabs in the templates
2018-01-02 08:31:12 +01:00
ec3ed1e5ff
removing unused code and reducing size of HTML in case QR code is turned off
2018-01-02 08:23:11 +01:00
98a8591a27
naming JS libraries consistently
2018-01-02 08:01:39 +01:00
094a0c80db
Merge branch 'master' into qrcode
2018-01-02 07:56:16 +01:00
bb54d46c7e
updating DOMPurify library, simplifying its use, ensuring HTML entities get escaped before formatting paste - regression introduced in #258 , reported in #269
2018-01-01 10:25:07 +01:00
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
39860dfdc4
making AttachmentViewer testable and implementing tests
2017-12-03 14:29:07 +01:00
dac86eb363
making AttachmentViewer testable
2017-11-28 06:38:10 +01:00
7bf5af761b
Add QR code generation when paste is created
2017-11-26 15:59:12 +01:00
a0740ff79f
getting rid of htmlEntities (except for tests) and setElementText (dropping IE9 support), changing urls2links interface, all to avoid double encoding sanitized HTML
2017-11-22 22:27:38 +01:00
9fa2ea3373
ensuring text is sanitized in all cases, before being injected into the DOM
2017-11-22 08:05:06 +01:00
2d00202b42
correcting the XSS test, commenting two failing patterns, to be reviewed by @rugk
2017-11-22 07:03:29 +01:00
233bd65b00
Merge branch 'master' into sanitizeMarkdown, changing test to use new library
2017-11-22 06:30:38 +01:00
bbec693cab
Allow DOMPurify as a global
2017-11-21 22:26:02 +01:00
b6d7d56774
Sanitize HTML code
...
using DOMPurify v1.0.2
Fixes https://github.com/PrivateBin/PrivateBin/issues/183
2017-11-21 21:22:51 +01:00
c6ddee317d
adding tests for PasteViewer class
2017-11-21 10:53:33 +01:00
rugk