thororm
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
thororm
b9075d7708
Removed attachmentHelpers and moved functionality to AttachmentViewer
2017-05-13 19:46:22 +02:00
rugk
4f070d8fcf
Merge branch 'Angristan-patch-1'
2017-05-11 10:24:53 +02:00
Angristan
c23c65f1f4
Corrections and missing translations
2017-05-10 22:06:19 +02:00
rugk
0ae952e63f
Add note about PostgreSQL
...
see https://github.com/PrivateBin/PrivateBin/issues/227
2017-05-04 16:49:16 +02:00
rugk
af595ed96d
Merge branch 'master' of origin
2017-04-19 00:50:24 +02:00
rugk
fa2dde0b1f
Use SQL highlighting
2017-04-19 00:49:59 +02:00
rugk
f514381aa5
Correct license
...
We do not use the acknowledge version.
Cf.:
Without ack.: https://spdx.org/licenses/Zlib.html#licenseText
With ack.: https://spdx.org/licenses/zlib-acknowledgement.html#licenseText
2017-04-19 00:09:41 +02:00
rugk
283873d89a
Fix stupid copy&paste error
2017-04-13 10:52:48 +02:00
rugk
9b6748c54d
Adjust requested changes
2017-04-13 10:46:09 +02:00
rugk
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
rugk
7eb77e90e5
Add retry button to page template too
2017-04-11 22:25:14 +02:00
rugk
d53207e404
Add password retry feature
2017-04-11 22:21:30 +02:00
El RIDO
f54036976a
added instantburnafterreading option to address #174
2017-04-11 17:23:26 +02:00
rugk
183ebe518b
Force JSON request for getting paste data
2017-04-11 16:34:13 +02:00
rugk
ab2e789aee
Add JS refactor to credits
2017-04-11 12:45:51 +02:00
El RIDO
fb774c2f8c
Merge branch 'js-unit-testing'
2017-04-07 06:23:46 +02:00
El RIDO
99b0c22bf4
Merge branch 'master' into js-unit-testing
2017-04-07 06:19:16 +02:00
El RIDO
41701bbfe4
trying to fix unit test execution in Travis
2017-04-05 06:55:20 +02:00
El RIDO
8f6c1ee079
added a check for the ZeroBin paste format (uses Base64.js v1.7)
2017-04-05 06:46:21 +02:00
El RIDO
2d4c75be85
added tests for entropy checks and key generation, added base64 experiment, showing we could replace Base64.js v2.1.9 with other options, but still need to find a way to handle v1.7 format and UTF16 to UTF8 conversion (btou / utob functions)
2017-04-04 07:43:41 +02:00
thororm
662b48fccf
Hashes
2017-04-02 19:28:25 +02:00
thororm
1a1369ff53
scrutinizer issues
2017-04-02 19:11:49 +02:00
thororm
ec9fb750b4
Adapted attachment handling to refactoring
2017-04-02 18:58:11 +02:00
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
f25ea35666
Merge branch 'idarlund-patch-4'
2017-03-29 19:43:02 +02:00
El RIDO
6470d74be3
Merge branch 'patch-4' of https://github.com/idarlund/PrivateBin into idarlund-patch-4
2017-03-29 19:41:43 +02:00
El RIDO
10fe965704
Merge branch 'stefanomarty-Italian-Translation'
2017-03-29 19:41:07 +02:00
El RIDO
89a00ea48e
Merge branch 'Italian-Translation' of https://github.com/stefanomarty/PrivateBin into stefanomarty-Italian-Translation
2017-03-29 19:39:15 +02:00
idarlund
806b665c6a
Update no.json
...
updated based on https://github.com/PrivateBin/PrivateBin/issues/201
2017-03-28 16:42:48 +02:00
El RIDO
3cf005c8ae
added test with hardcoded v1 pastes to ensure decryption of the original paste format still works, even when the format is changed in the future
2017-03-26 16:16:15 +02:00
El RIDO
cdb62b44c7
basic tests for CryptTool classes encryption and compression functions
2017-03-26 11:34:19 +02:00
El RIDO
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
El RIDO
e1ea14627f
handling JSVerify RNG state 88caf85079d32e416b
2017-03-26 06:47:57 +02:00
El RIDO
6fb3fe51b2
Merge branch 'master' into js-unit-testing
2017-03-26 06:46:42 +02:00
El RIDO
a8d02bd8e2
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2017-03-25 18:45:10 +01:00
El RIDO
cd40717301
fixing #209 , refactoring regression when file upload is disabled
2017-03-25 18:44:20 +01:00
stefanomarty
d23c696e97
Revert delete of (in Inglese)
2017-03-25 17:33:54 +01:00
rugk
056f6b01c8
Merge branch 'lex111-patch-1'
2017-03-25 15:14:59 +01:00
Alexey Pyltsyn
82e45915c7
Update Russian translation
2017-03-25 17:06:56 +03:00
Stefano Martinelli
d8e0a6e986
Italian translation update
...
- new strings translated
- couple of minor errors fixed
Some strings (i.e. line 133) are literal translations.
I could probably give a better translation by reading the messages in
their context, when I get the next update.
2017-03-25 14:42:31 +01:00
Stefano Martinelli
945d553830
Merge remote-tracking branch 'PrivateBin/master' into Italian-Translation
2017-03-25 14:35:16 +01:00
El RIDO
628696e524
Merge branch 'tupaschoal-patch-1'
2017-03-25 14:25:50 +01:00
Stefano Martinelli
2ffc42eb8d
Merge remote-tracking branch 'PrivateBin/master' into Italian-Translation
2017-03-25 14:21:02 +01:00
Tulio Leao
3fc6ede5bb
Translate missing IDs to Portuguese
...
As referenced on issue #201 , some IDs were missing from the pt translation, which were now translated.
2017-03-25 09:26:31 -03:00
El RIDO
44327bed58
added missing/removed translation IDs found using improved unit test ( #201 )
2017-03-25 13:19:11 +01:00
El RIDO
e80c726f92
added unit test for missing message IDs accross all translations, added IDs found this way to translation files ( #201 )
2017-03-25 12:46:08 +01:00
El RIDO
145cfccfcb
corrections for rngState 82b19a3e7604cf825d
2017-03-25 10:47:12 +01:00
El RIDO
e15e86ac3f
improving coverage of existing tests
2017-03-25 10:18:28 +01:00
El RIDO
2a19b42b15
making I18n class testable, adding minimal test
2017-03-25 09:41:24 +01:00
