rugk
d8616d1e68
Merge branch 'AreYouLoco-master'
2019-03-10 11:13:35 +01:00
AreYouLoco
8ea7c4cda6
Update polish translation.
2019-03-08 23:03:07 +01:00
rugk
742add3d1e
Merge branch 'Quenty31-patch-3'
2019-02-25 21:13:47 +01:00
Quentí
e01179653f
Update: added QR code
2019-02-25 20:45:59 +01:00
El RIDO
ec698681aa
Merge branch 'ff98sha-patch-1'
2019-02-23 07:17:56 +01:00
El RIDO
2a9d2f9993
Merge branch 'patch-1' of https://github.com/ff98sha/PrivateBin into ff98sha-patch-1
2019-02-23 07:15:20 +01:00
El RIDO
fd33cc8206
switch to newer node version, in an attempt to support mocha 6
2019-02-23 07:06:39 +01:00
ff98sha
9c3a4cebd4
Update zh.json
...
Modify translations and translate new strings.
2019-02-22 22:56:13 +08:00
El RIDO
48560e3d60
Merge branch 'fb-tracking-param-fix'
2019-01-22 20:06:04 +01:00
rugk
34c64acb75
Apply StyleCi recommendation
2019-01-22 00:14:31 +01:00
rugk
c2a46b7af7
Make JS function more robust
2019-01-22 00:07:28 +01:00
rugk
99d49a56ba
Fix PHPunit tests
2019-01-21 23:49:33 +01:00
rugk
7cb942aca3
Make PHP paste ID function more robust
2019-01-21 23:19:41 +01:00
rugk
541fff199a
Put PHP paste request into own function
2019-01-21 23:06:25 +01:00
El RIDO
6beea8f2f4
apply yet another StyleCI recommendations
2019-01-20 12:29:27 +01:00
El RIDO
e3d7ac4442
apply StyleCI recommendations
2019-01-20 12:28:03 +01:00
El RIDO
79a858f176
extracting only the 16 hex characters of the query string as paste ID, addressing #396
2019-01-20 12:20:37 +01:00
El RIDO
cc53d95ed1
extending test cases to reproduce the issue from #396 , causing the existing logic to now fail the tests
2019-01-20 11:05:34 +01:00
El RIDO
6bb599c81f
Merge branch 'Ahuahuachi'
2019-01-07 21:18:49 +01:00
Alfredo Fabián Altamirano
8f52173ec3
Translate new parameters
2019-01-07 21:13:37 +01:00
Alfredo Fabián Altamirano
287130dd37
Add missing translation for "QR code"
2019-01-07 21:11:19 +01:00
El RIDO
ec68abe2b5
revert formatting changes, for easier comparison of changes
2019-01-07 21:02:51 +01:00
Alfredo Fabián Altamirano
ce87b1cc39
Improved Spanish translation
2019-01-05 16:08:43 -06:00
El RIDO
c39e578f04
Merge branch 'micschwarz-patch-1'
2018-12-17 21:31:43 +01:00
Michael Schwarz
e220a97c8f
Improve German Translation for more consistency
2018-11-27 11:03:12 +01:00
El RIDO
fe670dc94f
Merge pull request #378 from PrivateBin/googlespy
...
Ask Google not to translate the page
2018-11-22 09:10:07 +01:00
rugk
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
El RIDO
9ce41022cf
correcting namespaces
2018-11-19 13:09:34 +01:00
El RIDO
18151e6e9e
Merge branch 'Quenty31-patch-2'
2018-11-16 18:05:26 +01:00
Quentí
7a5a97c6ae
Update translation
2018-11-15 22:17:08 +01:00
rugk
8b803a1f5d
Merge branch 'dan-nkl-patch-1'
2018-11-08 22:23:36 +01:00
rugk
3885047cb6
Update i18n/de.json
...
Co-Authored-By: dan-nkl <daniel@nikul.in>
2018-11-07 08:38:35 +01:00
Daniel Nikulin
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
rugk
9cce056cc8
Merge branch 'shrz-Fix-Ru-translation'
2018-10-28 20:04:16 +01:00
shrz
6f34626ad6
Fix Russian translation.
2018-10-28 18:20:54 +03: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
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
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
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
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
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
