Commit graph

1642 commits

Author SHA1 Message Date
El RIDO
81ac232710
increasing timeouts for travisCI, that seems to have gotten slower 2017-10-08 17:29:07 +02:00
El RIDO
cd5fded4a4
adapting configuration test generator to new INI model and point release support 2017-10-08 17:11:33 +02:00
El RIDO
9f26894b2e
PHP < 5.6 compatibility and StyleCI recommendations 2017-10-08 17:10:51 +02:00
El RIDO
4f06feef81
implemented JSON file conversion on purge and storage in PHP files for data leak protection 2017-10-08 16:59:31 +02:00
El RIDO
577586c47f
wrote a unit test to generate old style pastes and comments and check that the purge converts them to PHP files 2017-10-08 16:44:22 +02:00
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
30993d8763
Merge branch 'master' into js-unit-testing 2017-09-13 07:29:57 +02:00
El RIDO
4d2a297ec5
Merge branch 'Ahuahuachi-master', providing updated spanish translations 2017-09-13 07:25:39 +02:00
El RIDO
ba0ff3545d
started work on UiHelper tests 2017-09-13 07:23:56 +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
thororm
08972e4da3 Merge branch 'master' into attachment-handling 2017-08-12 13:29:51 +02:00
thororm
28b8f878dc Fixed decryption of pastes without attachment, that have a password 2017-08-12 13:26:43 +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
f31a99b1c0
added tests for getCipherData(), hasCipherData() & getTemplate() 2017-05-26 21:52:00 +02:00
El RIDO
fcfb02c2b7
added tests for getFormatterDefault(), fixing bug in compact design 2017-05-26 20:55:45 +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
thororm
b5c259dd72 Code review 2017-05-20 16:11:32 +02:00
thororm
39717707b3 Code review 2017-05-20 16:04:10 +02:00
thororm
a8aacce04d More localization defaults 2017-05-15 22:11:34 +02:00
thororm
2c17c35b85 Code review results and further improvements
Added english default for new translations
2017-05-15 22:05:52 +02:00
thororm
24aea957b3 Added possibility to paste an image from the clipboard 2017-05-13 21:43:32 +02:00
thororm
838ca3d38e Call removeAttachment on a new paste
Improved disabled attachments handling
2017-05-13 21:27:41 +02:00
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