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
360a0921e2
adding tests for Prompt class, typos
2017-11-20 08:49:25 +01:00
9d1a9a0da7
fixing paste success message handling in page template
2017-11-16 08:57:08 +01:00
73bc685178
fixing error message display revealed by testing remaining time display function
2017-11-14 06:52:12 +01:00
6c8f57f91f
making PasteStatus testable, adding test for paste creation notification
2017-11-13 21:57:49 +01:00
29419d03cd
avoid logs polluting the unit test output
2017-10-30 07:04:59 +01:00
9c6aec86c4
making Alert class resetable and adding first tests for it
2017-10-23 21:33:07 +02:00
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
414693fa90
testing both cases of the logic required for #167
2017-10-22 10:39:18 +02:00
6dbb098d7a
had to introduce a mock function to test the historyChange state
2017-10-22 09:56:44 +02:00
379571d522
Merge branch 'master' into js-unit-testing
2017-10-22 08:10:49 +02:00
6fa2bfe30e
updated documentation, incremented version
2017-10-08 16:40:51 +02:00
30993d8763
Merge branch 'master' into js-unit-testing
2017-09-13 07:29:57 +02:00
08972e4da3
Merge branch 'master' into attachment-handling
2017-08-12 13:29:51 +02:00
28b8f878dc
Fixed decryption of pastes without attachment, that have a password
2017-08-12 13:26:43 +02:00
fcfb02c2b7
added tests for getFormatterDefault(), fixing bug in compact design
2017-05-26 20:55:45 +02:00
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
b5c259dd72
Code review
2017-05-20 16:11:32 +02:00
39717707b3
Code review
2017-05-20 16:04:10 +02:00
2c17c35b85
Code review results and further improvements
...
Added english default for new translations
2017-05-15 22:05:52 +02:00
24aea957b3
Added possibility to paste an image from the clipboard
2017-05-13 21:43:32 +02:00
838ca3d38e
Call removeAttachment on a new paste
...
Improved disabled attachments handling
2017-05-13 21:27:41 +02:00
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
b9075d7708
Removed attachmentHelpers and moved functionality to AttachmentViewer
2017-05-13 19:46:22 +02:00
9b6748c54d
Adjust requested changes
2017-04-13 10:46:09 +02:00
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
d53207e404
Add password retry feature
2017-04-11 22:21:30 +02:00
183ebe518b
Force JSON request for getting paste data
2017-04-11 16:34:13 +02:00
662b48fccf
Hashes
2017-04-02 19:28:25 +02:00
ec9fb750b4
Adapted attachment handling to refactoring
2017-04-02 18:58:11 +02:00
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
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
6fb3fe51b2
Merge branch 'master' into js-unit-testing
2017-03-26 06:46:42 +02:00
cd40717301
fixing #209 , refactoring regression when file upload is disabled
2017-03-25 18:44:20 +01:00
e15e86ac3f
improving coverage of existing tests
2017-03-25 10:18:28 +01:00
57ebc7338d
Merge branch 'master' into js-unit-testing
2017-03-25 09:06:04 +01:00
bbcc3e167b
implementing recommendations of scrutinizer
2017-03-25 00:58:59 +01:00
0fb650c3a6
comply with codacys suggestion
2017-03-13 21:15:52 +01:00
b5cdfff3e3
fix missing comment status messages - ♫ lovely span, oh wonderful span ♪ (chorus) span, span, span, span, …
2017-03-13 21:11:26 +01:00
5bf25f227e
update JSDoc and re-published to https://privatebin.info/jsdoc/
2017-03-13 20:24:18 +01:00
ee43557a4f
ensure burn after reading and status messages are only changed after a successfull decryption
2017-03-13 19:30:44 +01:00
9deaed9406
working on asynch translation handling
2017-03-12 17:08:12 +01:00
1649ff34f5
restoring password protection
2017-03-12 16:06:17 +01:00
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
b6d8d0f250
found problem with unit test of baseUri function, makes code much simpler
2017-03-06 19:48:07 +01:00
fb99d5bb93
Merge branch 'master' into jsrefactor and fixing baseUri unit test
2017-03-05 12:11:55 +01:00
bd32a73d21
remove Safari link on bootstrap template, too
2017-03-05 11:10:52 +01:00
23b09d601d
credited Tulio for the portuguese translation, updated SRI hashes
2017-03-05 11:02:18 +01:00
d358271451
making unit tests work with spans
2017-03-02 19:44:43 +01:00
85aa072234
compromise: using spans, but with a class to give them a meaning
2017-02-28 20:11:57 +01:00
131e08ca33
made phpUnit and most mocha tests work again, had to remove some injected objects and added a helper method to facilitate a cache reset for the unit tests. Page template is still broken and the JS test for baseUri() fails
2017-02-25 09:35:55 +01:00
e880f7924c
Merge branch 'master' into jsrefactor
2017-02-25 07:30:44 +01:00
52d1be1b54
Fix https://github.com/PrivateBin/PrivateBin/issues/187
2017-02-17 22:26:39 +01:00
da094e2853
make it work(6): discussion/comments
2017-02-17 20:46:10 +01:00
7be5206920
makeit work(5): pase cloning & raw button
2017-02-15 22:59:55 +01:00
a652ab5896
make it work(4): display encrypted pastes
...
also improved file uploader, better structured
2017-02-14 22:21:55 +01:00
31e66131b7
make it work(3): allow paste submission
2017-02-13 21:12:00 +01:00
4cb0ce5114
Removed self from cspheader
...
Refactored some variable names
2017-02-13 20:37:57 +01:00
f33d702f3d
make it work(2): buttons & preview working
2017-02-13 11:35:04 +01:00
8a07a0b157
make it work(1): paste input can be shown
2017-02-12 21:13:04 +01:00
dd6e426da7
first round of refactoring
...
split into modules, moved code around
need to make it work
2017-02-12 18:08:08 +01:00
eedb05111a
added test for getCookie function, documenting its limitation of not finding cookies with empty identifier
2017-02-12 17:11:21 +01:00
faf596aeb7
Added preview for
...
- Video (HTML5)
- Audio (HTML5)
- PDF (Browser capabilities)
attachment.
Added drag & drop functionality
Added attachment preview to preview before submitting
2017-02-12 15:35:37 +01:00
b9c05b06d0
added test for sprintf function, removing dead code and optimizing test cases
2017-02-11 19:34:51 +01:00
dd721c651b
Update SRI hashes
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/181
2017-02-11 16:19:59 +01:00
b00bcd1352
added test for urls2links function, fixing bug - asterisk is allowed in URLs query string
2017-02-11 16:02:24 +01:00
b992bcc732
added test for setMessage function, fixing bug for elements with only one child
2017-02-11 10:43:00 +01:00
2ebcf60516
Use revealing module pattern
...
ala http://www.adequatelygood.com/JavaScript-Module-Pattern-In-Depth.html
Also made the loadTranslations a bit more robust with more error messaged being logged.
2017-02-08 13:20:51 +01:00
5130d9e2f3
New state for "only new button"
...
Used when the message cannot be decrypted.
Fixes https://github.com/PrivateBin/PrivateBin/issues/126
2017-02-06 22:39:45 +01:00
5ad02a3d1c
Use original reload function for manual paste open link
...
This fixes the issue where clicking on the link took you to the home page.
I seriously missed that this.reloadPage does not do the thing I thought it does,
so I updated the doc to make it clear and switched back to the correct function.
Basically reverts 86cd5e1c15
2017-02-06 20:39:52 +01:00
e483d60eed
Merge branch 'historyupdate'
...
Conflicts:
tpl/bootstrap.php
tpl/page.php
And update SRI.
@elrido also did not properly merge this branch. Doing it now…
2017-02-06 20:25:35 +01:00
4cb0374e11
readding accidentally removed line of #173
2017-02-06 20:16:03 +01:00
2ca2309fc4
Merge branch 'patch-1' of https://github.com/r4sas/PrivateBin into r4sas-patch-1
2017-02-06 19:55:07 +01:00
86cd5e1c15
Use existing reload function
2017-02-05 22:35:44 +01:00
edb546de54
Add loading indicator
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/172
2017-02-05 22:09:46 +01:00
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
366b61c32d
adding document title in new history state
2017-02-05 18:53:57 +01:00
f699ca6cd4
writing tests for htmlEntities function
2017-02-05 18:46:24 +01:00
5442af6e20
slight JS refactoring
2017-02-05 14:47:03 +01:00
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
4bbfd5045e
ensure that JS is *really* only initialized after the DOM is fully loaded, resolves #166
2017-01-30 20:29:04 +01:00
b76a73aa06
upgrading showdown
2017-01-29 16:17:56 +01:00
f1df27f46c
allowing for parameter strings starting with &
2017-01-29 15:09:57 +01:00
177c9d7114
Merge branch 'js-unit-testing'
2017-01-29 14:50:31 +01:00
cae5a71151
fix missing class renaming
2017-01-29 14:48:56 +01:00
efcfb80129
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2017-01-29 14:39:34 +01:00
d678f5dada
fixing inconsistency found in unit test
2017-01-29 14:32:55 +01:00
a005b1128b
Updated showdown
2017-01-23 22:49:03 -06:00
47e4478e17
Updated sjcl, bootstrap, and the hashes
2017-01-23 22:42:05 -06:00
8029c2819f
implementing JS module pattern to expose functions for unit testing
2017-01-22 10:42:11 +01:00
5f09264625
fixing documentation inconsitencies found by Scrutinizer CI
2017-01-14 16:13:22 +01:00
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
a7de0e095b
added supported language, updated credits and changelog
2017-01-10 20:37:14 +01:00
7f4ed739de
moved images to img folder
2017-01-08 10:13:12 +01:00
67f6c4eb61
turned bootstrap template variants into logic
2017-01-08 10:02:07 +01:00
87fad1fb77
DRYed templates
2017-01-08 09:40:13 +01:00
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
20fea819cb
Update SRI hashes
2017-01-07 20:35:47 +01:00
a5d91298ff
add an option to change the site name, solves #154
2017-01-01 16:33:11 +01:00
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
1426d4e371
tagging 1.1 release and updating documentation
2016-12-26 12:13:50 +01:00
1badd5e542
applying HTML entity cleanup to raw paste, too, fixing #137
2016-12-25 13:04:06 +01:00
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
aacfe8e5fa
added a forgotten option 'ru' in supportedLanguages section
2016-12-19 17:26:04 +03:00
2847bbc45d
added ru plural formula, updated template for edited privatebin.js
2016-12-16 12:21:15 +03:00
90e0bf6058
Merge branch 'tables'
2016-12-14 19:03:58 +01:00
58bd603c7c
Use nice condensed table with border
...
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01:00
bdf1586539
Add FAQ link & add to all templates
2016-12-12 18:37:54 +01:00
f755a99ab8
Add table class to parsed Markdown
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/140
2016-12-12 17:37:51 +01:00
b94d252421
Merge branch 'master' into JSnotWorkingError
2016-11-13 18:30:14 +01:00
3f2de319f3
should use typesafe comparison in JS and adding forgotten modal dialog in bootstrap-dark-page
2016-11-13 18:22:37 +01:00
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
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
1b0095b54a
Added localization for modal password dialog
2016-11-13 00:42:52 +01:00
1c643191ce
Updated intergrity hash for privatebin.js
2016-11-12 18:32:39 +01:00
6544fc8a49
Proper indenting and fix for "label for"
2016-11-12 18:21:33 +01:00
e8248020dd
Updated integrity hash
2016-11-11 18:53:35 +01:00
c1ca5657b5
Removed unnecessary attributes from modal password form
2016-11-11 18:41:41 +01:00
0fbeefb199
Added modal decryption password request
2016-11-11 18:28:20 +01:00
64e1e0d7c4
Merge branch 'master'
2016-10-31 12:20:29 +01:00
f9149595c9
Change alert to loading info message
2016-10-31 12:20:07 +01:00
375dac759f
renamed jQuery file to match projects JS file naming convention
2016-10-29 12:18:03 +02:00
f093b05330
update jQuery from 1.11.3 to 3.1.1
2016-10-29 12:12:22 +02:00
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
5d822af5b1
Regenerate JS hashes & sign commit
2016-10-25 19:03:20 +02:00
63a6ecb922
Now using the minimal version of jQuery
2016-10-21 17:06:22 -05:00
0a48c464b4
Update jquery 1.11.3 ==> 3.1.1
2016-10-21 10:31:56 -05:00
1a159c973f
Prevent referrer to be send
...
Uses both CSP and Referrer-Policy
Fixes #96
2016-09-03 18:12:24 +02:00
e925833090
bumping version number to 1.0
2016-08-25 09:53:31 +02:00
1907586b39
changing link to project page
2016-08-22 09:50:28 +02:00
5621f32752
Readd icon instead of logo for header
...
Continues #87
2016-08-21 16:51:54 +02:00
f7a75a9d33
Merge branch 'master' into newicon
2016-08-20 19:09:39 +02:00
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
8f19045b58
Replace icon with logo with text
2016-08-20 18:01:52 +02:00
47646e056b
fixing urlshortening regression caused by CSP introduction, resolves #10
2016-08-18 15:09:58 +02:00
f72e260ee7
adding subresource integrity hashes for all javascript includes, resolves #6
2016-08-16 11:11:03 +02:00
b94d2f2295
resolving a few spacing issues in the templates
2016-08-15 14:24:42 +02:00
eee2505a03
PR #56 was broken
...
This fixes the display now finally.
2016-08-10 20:20:36 +02:00
addb666a23
introducing CSP header to mitigate XSS attacks, closes #10
2016-08-09 14:46:32 +02:00
b45bef8388
Renamed classes for full PSR-2 compliance, some cleanup
2016-08-09 11:54:42 +02:00
5d7003ecc1
Convert to PSR-2 coding style (using phpcs-fixer)
2016-07-26 08:19:35 +02:00
54f96b9938
Introduce PSR-4 autoloading
2016-07-22 12:11:48 +02:00
d58eb13bfd
Use SVG icon instead of PNG version if possible
2016-07-19 14:30:44 +02:00
c5606a47fe
refactoring away RainTPL and templating, resolves #36
2016-07-19 14:02:26 +02:00
rugk