e64eaf45ee
Merge branch 'master' into webcrypto
2018-12-17 21:34:15 +01:00
c39e578f04
Merge branch 'micschwarz-patch-1'
2018-12-17 21:31:43 +01:00
c15351b793
designing v2 paste & comment format
2018-12-17 19:43:16 +01:00
cde96d8f24
fixing bug in jsonld processing with certain URL paths
2018-12-17 19:42:26 +01:00
e220a97c8f
Improve German Translation for more consistency
2018-11-27 11:03:12 +01:00
fe670dc94f
Merge pull request #378 from PrivateBin/googlespy
...
Ask Google not to translate the page
2018-11-22 09:10:07 +01:00
ac9eac5ed6
Ask google not to translate the page
...
We already have i18n. Furthermore, Google may analyse sensitive content for
the purpose of recognising whether the page needs to be translated, see
https://support.google.com/webmasters/answer/79812?hl=en
Ref https://github.com/threema-ch/threema-web/pull/681
2018-11-21 23:32:06 +01:00
2303c81ce0
Merge branch 'master' into webcrypto
2018-11-19 13:15:11 +01:00
9ce41022cf
correcting namespaces
2018-11-19 13:09:34 +01:00
b36b3d1a82
Merge branch 'master' into webcrypto
2018-11-16 18:36:07 +01:00
18151e6e9e
Merge branch 'Quenty31-patch-2'
2018-11-16 18:05:26 +01:00
30bb34a4fe
generate code docs for private interfaces, too
2018-11-16 18:04:09 +01:00
7a5a97c6ae
Update translation
2018-11-15 22:17:08 +01:00
8b803a1f5d
Merge branch 'dan-nkl-patch-1'
2018-11-08 22:23:36 +01:00
3885047cb6
Update i18n/de.json
...
Co-Authored-By: dan-nkl <daniel@nikul.in>
2018-11-07 08:38:35 +01:00
419311dffa
Update de.json
...
Better translations for German..
At least I think they are easier to understand.
2018-10-30 19:06:12 +01:00
9cce056cc8
Merge branch 'shrz-Fix-Ru-translation'
2018-10-28 20:04:16 +01:00
6f34626ad6
Fix Russian translation.
2018-10-28 18:20:54 +03:00
5b00f4ead7
further code deduplication
2018-10-20 23:08:13 +02:00
4c3fb3fe63
reduce code duplication
2018-10-20 22:34:36 +02:00
717e5b0e57
addressing issues found by codacy
2018-10-20 22:05:35 +02:00
0f76b9066d
remove SJCL library
2018-10-20 19:53:21 +02:00
2d7996570e
typos, documentation
2018-10-20 17:57:21 +02:00
2929d5c17a
fixing async comment nicknames
2018-10-20 13:54:17 +02:00
a08fed1add
ensure promises can be collected
2018-10-20 12:40:08 +02:00
35045bb69a
improving error handling
2018-10-20 11:40:37 +02:00
100d955e1a
address decryptComments() async compatibility
2018-10-20 10:20:32 +02:00
ff8ec5a1a0
address decryptOrPromptPassword(), decryptPaste() and decryptAttachment() async compatibility
2018-10-20 09:56:05 +02:00
c0d3b9062b
updating SRI hashes
2018-10-20 08:40:48 +02:00
17131f3172
Add verys important return to ensure Promise chain works
2018-10-08 21:04:13 +02:00
746debf586
Adjust functions using Uploader.setData to handle promises
2018-10-08 21:03:10 +02:00
94a352e7f5
Fix eslint config and issues
...
Note EcmaScript 2017 looks recent amd also is, e.g. we loose suport for IE and we loose support for some Android browsers, also Android <5 built-in browser.
2018-10-08 20:36:50 +02:00
bc0fb5b91e
Merge branch 'master' into webcrypto
2018-10-02 20:43:40 +02:00
00692a29d6
Merge branch 'SuperTux88-fix-dark-download-link'
2018-10-02 20:42:38 +02:00
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
b62e259cfb
Merge branch 'master' into webcrypto
2018-09-17 05:26:58 +02:00
034d60f966
Merge branch 'EmilKra-patch-1'
2018-09-17 05:26:15 +02:00
256a5b2450
Update pl.json
2018-09-16 16:50:44 +02:00
41c54325fa
Merge branch 'master' into webcrypto
2018-09-16 16:24:15 +02:00
f9e0b7236c
Merge branch 'EmilKra-patch-1'
2018-09-16 16:23:27 +02:00
dcee0c7d39
Update pl.json
2018-09-16 14:43:44 +02:00
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
f3eaee206c
using done() instead of promise, to enforce mocha to wait on the tests
2018-09-02 11:52:57 +02:00
176264f135
making tests use promises instead of async
2018-09-02 11:49:55 +02:00
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
b191e2c437
Merge remote-tracking branch 'origin/master' into webcrypto
2018-09-02 10:07:57 +02:00
d66800b8ce
docker is now provided via https://github.com/PrivateBin/docker-nginx-fpm-alpine
2018-09-02 09:22:55 +02:00
8b71cb0b2f
properly escaping HTML in raw text mode, fixes #358
2018-09-02 09:14:36 +02:00
30b7be0781
async test, finding error for rngState 00b15fc0a8247e693d, due to failure in decompressing
2018-09-01 22:55:52 +02:00
b97ac08003
improving tests, correcting cipher
2018-09-01 22:22:10 +02:00
El RIDO