Commit Graph

910 Commits

Author SHA1 Message Date
El RIDO 4ded4b7f8c
adding correct HTTP error to response, as per @rugk's recommentation 2017-10-08 16:43:46 +02:00
El RIDO dbfb1e83ba
removing dead code 2017-10-08 16:43:10 +02:00
El RIDO 62f0b95377
making StyleCI happy 2017-10-08 16:42:43 +02:00
El RIDO 6e8eafe129
implemented INI cenversion functionality 2017-10-08 16:42:11 +02:00
El RIDO b60d55236e
adding test for INI config file conversion 2017-10-08 16:41:39 +02:00
El RIDO 6fa2bfe30e
updated documentation, incremented version 2017-10-08 16:40:51 +02:00
El RIDO ed04fe3b4c
disabling two new options that do no match our style guidelines 2017-10-08 16:28:18 +02:00
El RIDO 9af79467a0
ask composer in TravisCI to use an oauth token to avoid rate limiting 2017-10-08 16:26:54 +02:00
El RIDO 6625a9dc59
hiding INI contents from StyleCI 2017-10-08 16:26:21 +02:00
rugk f037967820
changes the file extension to php and adds a small one-liner to stop PHP from presenting the file to any website visitor
Signed-off-by: El RIDO <elrido@gmx.net>
2017-10-08 16:25:48 +02:00
El RIDO 7197705d5c
updating unit test in preparation for planned file name change, currently failing 2017-10-08 16:25:11 +02:00
rugk 58937aced4
Merge branch 'Kcchouette-patch-1' 2017-09-23 14:11:38 +02:00
Kcchouette 78f9f5279a Remove the last ")" 2017-09-21 10:02:25 +02:00
Kcchouette cf1b670215 Update fr.json 2017-09-20 11:46:05 +02:00
El RIDO 4d2a297ec5
Merge branch 'Ahuahuachi-master', providing updated spanish translations 2017-09-13 07:25:39 +02:00
Alfredo Fabián Altamirano Tena 5cdd1f480f Updated spanish translation 2017-09-12 17:27:51 -05:00
rugk c898da6279
Merge branch 'Quent-in-patch-3' 2017-09-08 12:17:32 +02:00
Quent-in c42e7fdd03 Update oc.json
missing word
2017-09-08 10:17:03 +02:00
Quent-in 18adcca66e Correction typo + new strings 2017-09-08 10:15:02 +02:00
rugk 70b80b5bca
Deduplicate installation instructions
Maintaining them in two places is bad and just creates problems. As they can
& should be improved by the community, let's now use the wiki.
2017-08-10 22:01:20 +02:00
rugk 92f2d27cb7
Improve Readme 2017-08-10 21:54:38 +02:00
rugk 53a8449674
Update HTTPS part of Readme
Do not advise against CAs, make clear HTTPS protects against some enumerated
threats.
2017-08-10 21:51:10 +02:00
rugk 674ebbc6fb
Remove bullet point
It is just useless here.
2017-07-06 19:14:49 +02:00
rugk 5a23284645
Merge branch 'war59312-patch-1' 2017-05-28 23:00:13 +02:00
Will 3a24e19e49 README: Fix some minior grammar mistakes
Fixes a few more minor grammar mistakes
2017-05-28 15:16:23 -04:00
rugk 9541a68b97
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2017-05-28 17:10:19 +02:00
rugk c6c1fb8957
Merge branch 'JTCozart-patch-1' 2017-05-28 17:09:02 +02:00
El RIDO a1881ff49b
Merge branch 'js-unit-testing' 2017-05-22 22:41:30 +02:00
El RIDO a30b31b315
Merge branch 'master' into js-unit-testing 2017-05-22 22:38:49 +02:00
El RIDO 5c3e2b3fae
fix travis once more, this time due to jsdom breaking compatibility with nodeJS < 6 2017-05-22 22:34:12 +02:00
El RIDO 9f01ccc80e
added tests for getExpirationDefault() 2017-05-22 22:15:13 +02:00
Jake Cozart ddd5128776 Updated bootstrap.php to fix a display issue
The text "password (recommended)" on the password field was being truncated to "password (recommen" because of a size issue.
2017-05-20 15:08:17 -07: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
El RIDO f54036976a
added instantburnafterreading option to address #174 2017-04-11 17:23:26 +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
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