Commit Graph

381 Commits

Author SHA1 Message Date
El RIDO
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
El RIDO
ec3ed1e5ff removing unused code and reducing size of HTML in case QR code is turned off 2018-01-02 08:23:11 +01:00
El RIDO
98a8591a27 naming JS libraries consistently 2018-01-02 08:01:39 +01:00
El RIDO
094a0c80db Merge branch 'master' into qrcode 2018-01-02 07:56:16 +01:00
El RIDO
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
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
39860dfdc4 making AttachmentViewer testable and implementing tests 2017-12-03 14:29:07 +01:00
El RIDO
dac86eb363 making AttachmentViewer testable 2017-11-28 06:38:10 +01:00
rugk
7bf5af761b Add QR code generation when paste is created 2017-11-26 15:59:12 +01:00
El RIDO
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
El RIDO
9fa2ea3373 ensuring text is sanitized in all cases, before being injected into the DOM 2017-11-22 08:05:06 +01:00
El RIDO
2d00202b42 correcting the XSS test, commenting two failing patterns, to be reviewed by @rugk 2017-11-22 07:03:29 +01:00
El RIDO
233bd65b00 Merge branch 'master' into sanitizeMarkdown, changing test to use new library 2017-11-22 06:30:38 +01:00
rugk
bbec693cab Allow DOMPurify as a global 2017-11-21 22:26:02 +01:00
rugk
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
El RIDO
c6ddee317d adding tests for PasteViewer class 2017-11-21 10:53:33 +01:00
El RIDO
360a0921e2 adding tests for Prompt class, typos 2017-11-20 08:49:25 +01:00
El RIDO
9d1a9a0da7 fixing paste success message handling in page template 2017-11-16 08:57:08 +01:00
El RIDO
73bc685178 fixing error message display revealed by testing remaining time display function 2017-11-14 06:52:12 +01:00
El RIDO
6c8f57f91f making PasteStatus testable, adding test for paste creation notification 2017-11-13 21:57:49 +01:00
El RIDO
29419d03cd avoid logs polluting the unit test output 2017-10-30 07:04:59 +01:00
El RIDO
9c6aec86c4 making Alert class resetable and adding first tests for it 2017-10-23 21:33:07 +02:00
El RIDO
4410ddcd84 adding tests for UiHelper.reloadHome, making UiHelper unit testable and handling JSVerify RNG states 846932d5afb10ce748 & 012c1f9483adb6e750 2017-10-22 13:39:23 +02:00
El RIDO
414693fa90 testing both cases of the logic required for #167 2017-10-22 10:39:18 +02:00
El RIDO
6dbb098d7a had to introduce a mock function to test the historyChange state 2017-10-22 09:56:44 +02:00
El RIDO
379571d522 Merge branch 'master' into js-unit-testing 2017-10-22 08:10:49 +02:00
El RIDO
6fa2bfe30e updated documentation, incremented version 2017-10-08 16:40:51 +02:00
El RIDO
30993d8763 Merge branch 'master' into js-unit-testing 2017-09-13 07:29:57 +02:00
thororm
08972e4da3 Merge branch 'master' into attachment-handling 2017-08-12 13:29:51 +02:00
thororm
28b8f878dc Fixed decryption of pastes without attachment, that have a password 2017-08-12 13:26:43 +02:00
El RIDO
fcfb02c2b7 added tests for getFormatterDefault(), fixing bug in compact design 2017-05-26 20:55:45 +02:00
Jake Cozart
ddd5128776 Updated bootstrap.php to fix a display issue
The text "password (recommended)" on the password field was being truncated to "password (recommen" because of a size issue.
2017-05-20 15:08:17 -07:00
thororm
b5c259dd72 Code review 2017-05-20 16:11:32 +02:00
thororm
39717707b3 Code review 2017-05-20 16:04:10 +02:00
thororm
2c17c35b85 Code review results and further improvements
Added english default for new translations
2017-05-15 22:05:52 +02:00
thororm
24aea957b3 Added possibility to paste an image from the clipboard 2017-05-13 21:43:32 +02:00
thororm
838ca3d38e Call removeAttachment on a new paste
Improved disabled attachments handling
2017-05-13 21:27:41 +02:00
thororm
23f5dfbff8 Merge remote-tracking branch 'remotes/thororm/master' into attachment-handling
# Conflicts:
#	tpl/bootstrap.php
#	tpl/page.php
2017-05-13 19:48:25 +02:00
thororm
b9075d7708 Removed attachmentHelpers and moved functionality to AttachmentViewer 2017-05-13 19:46:22 +02:00
rugk
9b6748c54d Adjust requested changes 2017-04-13 10:46:09 +02:00
rugk
073b52ce96 Pass on event
Thus the receiving function also had to be adjusted, so the right data is passed on.
2017-04-11 22:36:25 +02:00
rugk
7eb77e90e5 Add retry button to page template too 2017-04-11 22:25:14 +02:00
rugk
d53207e404 Add password retry feature 2017-04-11 22:21:30 +02:00
rugk
183ebe518b Force JSON request for getting paste data 2017-04-11 16:34:13 +02:00
thororm
662b48fccf Hashes 2017-04-02 19:28:25 +02:00
thororm
ec9fb750b4 Adapted attachment handling to refactoring 2017-04-02 18:58:11 +02:00
thororm
096f07f86e Merge branch 'master' into attachment-handling
# Conflicts:
#	js/privatebin.js
#	tpl/bootstrap.php
#	tpl/page.php
2017-04-02 13:30:52 +02:00
El RIDO
37f5d99bc4 finalizing tests for I18n class, AJAX loading of translations needs to be tested in browser, mocked for now 2017-03-26 09:24:42 +02:00
El RIDO
6fb3fe51b2 Merge branch 'master' into js-unit-testing 2017-03-26 06:46:42 +02:00
El RIDO
cd40717301 fixing #209, refactoring regression when file upload is disabled 2017-03-25 18:44:20 +01:00