rugk
626b4450e3
Merge branch 'master' into burnafterreading-fix
2018-05-22 10:57:30 +02:00
rugk
733cc70967
Improve code style of function names
...
Thx
429d43dc78 (r29068381)
2018-05-22 10:19:53 +02:00
rugk
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
rugk
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
rugk
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
El RIDO
caf87cc6f1
Merge branch 'master' into burnafterreading-fix, regression in expired paste error
2018-04-30 20:01:38 +02:00
El RIDO
b618bad51c
minor fix
2018-04-30 18:26:33 +02:00
Alexander Do
1648780269
Fix bootstrap template
2018-04-30 05:45:40 +00: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
El RIDO
de4b96c5ed
Merge branch 'blob' of https://github.com/otaku/PrivateBin into otaku-blob
2018-04-29 10:28:40 +02:00
El RIDO
e4bf41202e
Merge branch 'master' into js-unit-testing
2018-04-29 08:53:59 +02:00
Alexander Do
5bee666a6b
Update SRI hashes
2018-04-09 16:40:10 +00:00
rugk
09a04b96c0
Update SRI hashes
2018-04-08 23:09:13 +02:00
El RIDO
78c186d6bc
avoid StyleCI complaint
2018-03-04 13:19:49 +01:00
El RIDO
0938b59b90
attributes contain strings, not booleans
2018-03-04 11:47:58 +01:00
El RIDO
76debde85b
found and fixed a bug in TopNav.collapseBar() while writing test for it
2018-03-03 07:55:27 +01:00
El RIDO
ce6764e97d
introduce built in asserts, working on TopNav, correcting some docs
2018-03-01 06:43:30 +01:00
El RIDO
cb2af8687e
Merge branch 'master' into js-unit-testing
2018-02-25 10:20:07 +01:00
El RIDO
4653085d2e
Merge branch 'master' into fixurlshortener
2018-02-25 10:10:05 +01:00
El RIDO
d07f8d8f96
fixing indentation, replicating change to other template
2018-02-25 10:09:19 +01:00
El RIDO
266b71bfd0
Merge branch 'master' into js-unit-testing
2018-02-25 09:51:49 +01:00
El RIDO
a3e0418b33
working on TopNav tests
2018-02-25 09:45:51 +01:00
rugk
0687448d0a
Fix some issues from ESLint
2018-02-21 22:51:31 +01:00
rugk
904f0de245
Fix indendation
2018-02-21 22:31:01 +01:00
rugk
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
El RIDO
ffae6111b0
handling further JSHint warnings and TODOs
2018-01-06 13:32:07 +01:00
El RIDO
98d07e0789
improving code quality issues reported by Codacy
2018-01-06 10:57:54 +01:00
El RIDO
d92755f030
undoing code style regression
2018-01-06 09:58:19 +01:00
El RIDO
72acc95326
improving code quality issues suggested by JSHint
2018-01-06 09:26:10 +01:00
El RIDO
5e070db6a1
reverting escaping just for Markdown formatting, as discussed in #269
2018-01-03 21:18:33 +01:00
El RIDO
a95701bba8
completing DiscussionViewer testing
2018-01-02 15:38:37 +01:00
El RIDO
85401a1513
Merge branch 'master' into js-unit-testing
2018-01-02 09:37:46 +01:00
El RIDO
6ce0fe55f6
revert as per StyleCI: missed one
2018-01-02 08:41:45 +01:00
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
El RIDO
e15e86ac3f
improving coverage of existing tests
2017-03-25 10:18:28 +01:00
El RIDO
57ebc7338d
Merge branch 'master' into js-unit-testing
2017-03-25 09:06:04 +01:00
El RIDO
bbcc3e167b
implementing recommendations of scrutinizer
2017-03-25 00:58:59 +01:00
El RIDO
0fb650c3a6
comply with codacys suggestion
2017-03-13 21:15:52 +01:00
El RIDO
63617ade72
Merge branch 'master' into jsrefactor
2017-03-13 21:13:06 +01:00
El RIDO
b5cdfff3e3
fix missing comment status messages - ♫ lovely span, oh wonderful span ♪ (chorus) span, span, span, span, …
2017-03-13 21:11:26 +01:00
El RIDO
5bf25f227e
update JSDoc and re-published to https://privatebin.info/jsdoc/
2017-03-13 20:24:18 +01:00
El RIDO
ee43557a4f
ensure burn after reading and status messages are only changed after a successfull decryption
2017-03-13 19:30:44 +01:00
El RIDO
9deaed9406
working on asynch translation handling
2017-03-12 17:08:12 +01:00
El RIDO
1649ff34f5
restoring password protection
2017-03-12 16:06:17 +01:00
El RIDO
81b00dd422
fixing page template, removing error messages when markdown or source are disabled in configuration, re-removing unnecessary spans
2017-03-12 14:16:08 +01:00
El RIDO
be0919893d
updating shipped .htaccess files for Apache 2.4 as per https://httpd.apache.org/docs/2.4/upgrading.html#access - Thanks @EchoDev, fixes #194
2017-03-11 08:56:14 +01:00
El RIDO
b6d8d0f250
found problem with unit test of baseUri function, makes code much simpler
2017-03-06 19:48:07 +01:00
El RIDO
fb99d5bb93
Merge branch 'master' into jsrefactor and fixing baseUri unit test
2017-03-05 12:11:55 +01:00
El RIDO
bd32a73d21
remove Safari link on bootstrap template, too
2017-03-05 11:10:52 +01:00
El RIDO
89f2a3701c
Merge branch 'master' of https://github.com/nolsen42/PrivateBin into nolsen42-master
2017-03-05 11:05:29 +01:00
El RIDO
23b09d601d
credited Tulio for the portuguese translation, updated SRI hashes
2017-03-05 11:02:18 +01:00
