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
cd40717301
fixing #209 , refactoring regression when file upload is disabled
2017-03-25 18:44:20 +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
El RIDO
d358271451
making unit tests work with spans
2017-03-02 19:44:43 +01:00
Nathaniel Olsen
84ae15e6ad
Safari isn't available on Windows anymore
...
We don't need to mention Safari, as apple has dropped support for Windows anymore, and since Internet Explorer isn't on Macs, there should be little to worry about :p
2017-03-01 12:41:50 -06:00
El RIDO
85aa072234
compromise: using spans, but with a class to give them a meaning
2017-02-28 20:11:57 +01:00
El RIDO
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
El RIDO
e880f7924c
Merge branch 'master' into jsrefactor
2017-02-25 07:30:44 +01:00
rugk
52d1be1b54
Fix https://github.com/PrivateBin/PrivateBin/issues/187
2017-02-17 22:26:39 +01:00
rugk
da094e2853
make it work(6): discussion/comments
2017-02-17 20:46:10 +01:00
rugk
7be5206920
makeit work(5): pase cloning & raw button
2017-02-15 22:59:55 +01:00
rugk
a652ab5896
make it work(4): display encrypted pastes
...
also improved file uploader, better structured
2017-02-14 22:21:55 +01:00
rugk
31e66131b7
make it work(3): allow paste submission
2017-02-13 21:12:00 +01:00
thororm
4cb0ce5114
Removed self from cspheader
...
Refactored some variable names
2017-02-13 20:37:57 +01:00
rugk
f33d702f3d
make it work(2): buttons & preview working
2017-02-13 11:35:04 +01:00
rugk
8a07a0b157
make it work(1): paste input can be shown
2017-02-12 21:13:04 +01:00
rugk
dd6e426da7
first round of refactoring
...
split into modules, moved code around
need to make it work
2017-02-12 18:08:08 +01:00
El RIDO
eedb05111a
added test for getCookie function, documenting its limitation of not finding cookies with empty identifier
2017-02-12 17:11:21 +01:00
thororm
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
El RIDO
b9c05b06d0
added test for sprintf function, removing dead code and optimizing test cases
2017-02-11 19:34:51 +01:00
rugk
dd721c651b
Update SRI hashes
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/181
2017-02-11 16:19:59 +01:00
El RIDO
b00bcd1352
added test for urls2links function, fixing bug - asterisk is allowed in URLs query string
2017-02-11 16:02:24 +01:00
El RIDO
b992bcc732
added test for setMessage function, fixing bug for elements with only one child
2017-02-11 10:43:00 +01:00
rugk
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
rugk
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
rugk
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
rugk
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
El RIDO
4cb0374e11
readding accidentally removed line of #173
2017-02-06 20:16:03 +01:00
El RIDO
2ca2309fc4
Merge branch 'patch-1' of https://github.com/r4sas/PrivateBin into r4sas-patch-1
2017-02-06 19:55:07 +01:00
rugk
86cd5e1c15
Use existing reload function
2017-02-05 22:35:44 +01:00
rugk
edb546de54
Add loading indicator
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/172
2017-02-05 22:09:46 +01:00
rugk
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
El RIDO
366b61c32d
adding document title in new history state
2017-02-05 18:53:57 +01:00
El RIDO
f699ca6cd4
writing tests for htmlEntities function
2017-02-05 18:46:24 +01:00
El RIDO
5442af6e20
slight JS refactoring
2017-02-05 14:47:03 +01:00
