Commit Graph

1203 Commits

Author SHA1 Message Date
El RIDO bc0fb5b91e
Merge branch 'master' into webcrypto 2018-10-02 20:43:40 +02:00
El RIDO 00692a29d6
Merge branch 'SuperTux88-fix-dark-download-link' 2018-10-02 20:42:38 +02:00
Benjamin Neff 538462f134
Fix download-link color in dark boostrap themes
This makes the "Download attachment" link white in bootstrap-dark and
boostrap-dark-page. This is an upstream bug of darkstrap, but it's not
maintained anymore.
2018-10-02 02:06:44 +02:00
El RIDO b62e259cfb
Merge branch 'master' into webcrypto 2018-09-17 05:26:58 +02:00
El RIDO 034d60f966
Merge branch 'EmilKra-patch-1' 2018-09-17 05:26:15 +02:00
EmilKra 256a5b2450
Update pl.json 2018-09-16 16:50:44 +02:00
El RIDO 41c54325fa
Merge branch 'master' into webcrypto 2018-09-16 16:24:15 +02:00
El RIDO f9e0b7236c
Merge branch 'EmilKra-patch-1' 2018-09-16 16:23:27 +02:00
EmilKra dcee0c7d39
Update pl.json 2018-09-16 14:43:44 +02:00
El RIDO 762386efd7
reverting to promises, since done can cause timeouts, indicating that the async execution can be really slow 2018-09-02 12:12:55 +02:00
El RIDO f3eaee206c
using done() instead of promise, to enforce mocha to wait on the tests 2018-09-02 11:52:57 +02:00
El RIDO 176264f135
making tests use promises instead of async 2018-09-02 11:49:55 +02:00
El RIDO b791157717
fix unit tests after merge from master, issues due to newly async tests that cause environment changes across test scripts 2018-09-02 11:33:27 +02:00
El RIDO b191e2c437
Merge remote-tracking branch 'origin/master' into webcrypto 2018-09-02 10:07:57 +02:00
El RIDO d66800b8ce
docker is now provided via https://github.com/PrivateBin/docker-nginx-fpm-alpine 2018-09-02 09:22:55 +02:00
El RIDO 8b71cb0b2f
properly escaping HTML in raw text mode, fixes #358 2018-09-02 09:14:36 +02:00
El RIDO 30b7be0781
async test, finding error for rngState 00b15fc0a8247e693d, due to failure in decompressing 2018-09-01 22:55:52 +02:00
El RIDO b97ac08003
improving tests, correcting cipher 2018-09-01 22:22:10 +02:00
El RIDO 0dbbb61d11
implementing web crypto API for encryption 2018-09-01 19:42:22 +02:00
rugk fe7fa09ce8
Merge branch 'idarlund-patch-5' 2018-08-14 17:56:18 +02:00
idarlund 5f8aeabea0
Update no.json
update missing text for getting paste data
2018-08-14 13:01:46 +02:00
El RIDO bd6888687f
Merge branch 'master' into webcrypto 2018-08-14 06:59:47 +02:00
El RIDO 8db98becb7
upgrading DOMpurify library 2018-08-11 19:45:57 +02:00
El RIDO b5ebc4a3d7
incrementing version 2018-08-11 19:29:58 +02:00
El RIDO fb6a9ccf09
document changes 2018-08-11 08:17:08 +02:00
El RIDO 10201dc463
expanded unit tests to cover mega links, reverted regex to old one, but fixed to cover mega links, just to prove it works 2018-08-11 07:33:33 +02:00
El RIDO c468b74b9b
Merge branch 'master' into linkregex 2018-08-11 06:56:02 +02:00
El RIDO e4cc9ef4f6
Merge branch 'r4sas-update-ru' 2018-08-06 19:40:17 +02:00
R4SAS 9a5be5521b
update ru translation 2018-08-06 20:24:59 +03:00
El RIDO c4fc7edc43
replacing Base64.js with browser built in's, except for legacy paste support 2018-08-05 08:56:03 +02:00
El RIDO 6f25d651b7
switching to client side libraries for key generation, remove legacy browser support 2018-08-04 22:30:01 +02:00
El RIDO c9a3bb08ee
remove dead code 2018-08-04 17:49:08 +02:00
El RIDO 4f332b7719
revert legacy browser support, dropped in favour of webcrypto API 2018-08-04 17:25:59 +02:00
El RIDO 0319a16b15
support older browsers correctly and ensure the paranoia setting for the sjcl.random.isReady call matches paranoia level 10 instead of the default 6 2018-08-04 13:25:31 +02:00
El RIDO 1be1047a94
while we do start the collection of randomness even before initializing our logic, raising the 'paranoia' parameter to 10 ensures that in legacy browsers not yet supporting the webcrypto API we would get an exception, instead of a weak key 2018-08-01 21:56:23 +02:00
El RIDO a5e8eeaaf9
StyleCI: Obey the alphabet #342 2018-07-29 16:15:52 +02:00
El RIDO 4a35428499
cleanup of PurgeLimiter #342 2018-07-29 16:05:57 +02:00
El RIDO 3470dcd9a8
more compact ServerSalt #342 2018-07-29 15:50:36 +02:00
El RIDO 5db3412b69
cleanup of TrafficLimiter #342 2018-07-29 15:43:28 +02:00
El RIDO f9c8441edb
renaming controller #342 2018-07-29 15:17:35 +02:00
El RIDO 90e83ddb30
bump changelog, fixes #344 2018-07-24 20:32:18 +02:00
El RIDO 055a2fb9d8
incrementing version 2018-07-22 11:44:18 +02:00
El RIDO b781e179c4
adding two more things not to get release archived 2018-07-22 11:40:34 +02:00
El RIDO 756a810395
better link 2018-07-22 11:16:36 +02:00
El RIDO e2c04e13e8
fixing doc block for jsdoc 2018-07-22 10:24:39 +02:00
El RIDO 640e5a7fe1
Merge remote-tracking branch 'origin/fix-password' 2018-07-21 08:51:25 +02:00
El RIDO e78d35ccd7 add missing translation 2018-07-21 06:45:28 +00:00
El RIDO 720897b902 correct CSP to allow password prompt 2018-07-21 06:45:09 +00:00
El RIDO 3fecd0f2ce correct page template & password prompt/modal, fixes #341, remove JS map reference leading to unnecessary load error 2018-07-21 06:44:04 +00:00
rugk 4f17dde5ee
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2018-07-01 20:23:17 +02:00