Commit Graph

  • 9744c02b04
    disabling two new options that do no match our style guidelines El RIDO 2017-10-03 20:49:36 +0200
  • 3abb333d0b
    make travis use phpunit < 6 to avoid failing builds for PHP 7, see: https://github.com/travis-ci/travis-ci/issues/7226#issuecomment-285852088 El RIDO 2017-03-12 14:38:49 +0100
  • 0eaf803490
    ask composer in TravisCI to use an oauth token to avoid rate limiting El RIDO 2017-10-03 20:34:39 +0200
  • dd32156c9b
    hiding INI contents from StyleCI El RIDO 2017-10-03 20:33:24 +0200
  • bb639d7894
    changes the file extension to php and adds a small one-liner to stop PHP from presenting the file to any website visitor rugk 2017-09-29 18:59:02 +0200
  • 2c8a4c631b
    updating unit test in preparation for planned file name change, currently failing El RIDO 2017-10-03 19:45:47 +0200
  • 58937aced4
    Merge branch 'Kcchouette-patch-1' rugk 2017-09-23 14:11:38 +0200
  • 78f9f5279a Remove the last ")" #250 Kcchouette 2017-09-21 10:02:25 +0200
  • cf1b670215 Update fr.json Kcchouette 2017-09-20 11:46:05 +0200
  • 30993d8763
    Merge branch 'master' into js-unit-testing El RIDO 2017-09-13 07:29:57 +0200
  • 4d2a297ec5
    Merge branch 'Ahuahuachi-master', providing updated spanish translations El RIDO 2017-09-13 07:25:39 +0200
  • ba0ff3545d
    started work on UiHelper tests El RIDO 2017-09-13 07:23:56 +0200
  • 5cdd1f480f Updated spanish translation #248 Alfredo Fabián Altamirano Tena 2017-09-12 17:27:51 -0500
  • c898da6279
    Merge branch 'Quent-in-patch-3' rugk 2017-09-08 12:17:32 +0200
  • c42e7fdd03 Update oc.json #247 Quent-in 2017-09-08 10:17:03 +0200
  • 18adcca66e Correction typo + new strings Quent-in 2017-09-08 10:15:02 +0200
  • 08972e4da3 Merge branch 'master' into attachment-handling #182 thororm 2017-08-12 13:29:51 +0200
  • 28b8f878dc Fixed decryption of pastes without attachment, that have a password thororm 2017-08-12 13:26:43 +0200
  • 70b80b5bca
    Deduplicate installation instructions rugk 2017-08-10 22:01:20 +0200
  • 92f2d27cb7
    Improve Readme rugk 2017-08-10 21:54:38 +0200
  • 53a8449674
    Update HTTPS part of Readme rugk 2017-08-10 21:51:10 +0200
  • 674ebbc6fb
    Remove bullet point rugk 2017-07-06 19:14:49 +0200
  • e35d349ac4 Merge d2892b3139 into 5a23284645 #223 __cyp 2017-06-05 05:58:56 +0000
  • 5a23284645
    Merge branch 'war59312-patch-1' rugk 2017-05-28 23:00:13 +0200
  • 3a24e19e49 README: Fix some minior grammar mistakes #233 Will 2017-05-28 15:16:23 -0400
  • 9541a68b97
    Merge branch 'master' of https://github.com/PrivateBin/PrivateBin rugk 2017-05-28 17:10:19 +0200
  • c6c1fb8957
    Merge branch 'JTCozart-patch-1' rugk 2017-05-28 17:09:02 +0200
  • f31a99b1c0
    added tests for getCipherData(), hasCipherData() & getTemplate() El RIDO 2017-05-26 21:52:00 +0200
  • fcfb02c2b7
    added tests for getFormatterDefault(), fixing bug in compact design El RIDO 2017-05-26 20:55:45 +0200
  • fe24371cce
    [fix] rename function canHtaccess by restrictAccessTo magikcypress 2017-05-22 23:50:30 +0200
  • a1881ff49b
    Merge branch 'js-unit-testing' El RIDO 2017-05-22 22:41:30 +0200
  • a30b31b315
    Merge branch 'master' into js-unit-testing El RIDO 2017-05-22 22:38:49 +0200
  • 5c3e2b3fae
    fix travis once more, this time due to jsdom breaking compatibility with nodeJS < 6 El RIDO 2017-05-22 22:34:12 +0200
  • 9f01ccc80e
    added tests for getExpirationDefault() El RIDO 2017-05-22 22:15:13 +0200
  • 9eea316b86
    [fix] compare version apache && ServerSalt namespace magikcypress 2017-05-22 21:21:55 +0200
  • ddd5128776 Updated bootstrap.php to fix a display issue #232 Jake Cozart 2017-05-20 15:08:17 -0700
  • f23b1222dd
    [enh] Create .htaccess into data #222 magikcypress 2017-05-20 18:59:17 +0200
  • 8994a35f41
    Corrections and missing translations Angristan 2017-05-10 22:06:19 +0200
  • 7fa4e7414d
    Add note about PostgreSQL rugk 2017-05-04 16:49:16 +0200
  • b5c259dd72 Code review thororm 2017-05-20 16:11:32 +0200
  • 39717707b3 Code review thororm 2017-05-20 16:04:10 +0200
  • a8aacce04d More localization defaults thororm 2017-05-15 22:11:34 +0200
  • 2c17c35b85 Code review results and further improvements Added english default for new translations thororm 2017-05-15 22:05:52 +0200
  • 24aea957b3 Added possibility to paste an image from the clipboard thororm 2017-05-13 21:43:32 +0200
  • 838ca3d38e Call removeAttachment on a new paste Improved disabled attachments handling thororm 2017-05-13 21:27:41 +0200
  • 23f5dfbff8 Merge remote-tracking branch 'remotes/thororm/master' into attachment-handling thororm 2017-05-13 19:48:25 +0200
  • b9075d7708 Removed attachmentHelpers and moved functionality to AttachmentViewer thororm 2017-05-13 19:46:22 +0200
  • 4f070d8fcf
    Merge branch 'Angristan-patch-1' rugk 2017-05-11 10:24:53 +0200
  • c23c65f1f4 Corrections and missing translations #228 Angristan 2017-05-10 22:06:19 +0200
  • 0ae952e63f
    Add note about PostgreSQL rugk 2017-05-04 16:49:16 +0200
  • e64b0bb0ec [fix] a little bit error magikcypress 2017-04-29 02:36:47 +0200
  • 90087123ba [fix] Do not create .htaccess with Nginx magikcypress 2017-04-28 17:41:05 +0200
  • 40cb55b3d5 Move default access_log config into own overwritable file Michael Contento 2017-04-27 16:02:19 +0200
  • 3718ea34ee Disable php-fpm access.log, as nginx already logs the access Michael Contento 2017-04-27 15:43:35 +0200
  • 7078cdfe7d Ensure nginx writes properly to stdout/stderr Michael Contento 2017-04-27 15:04:55 +0200
  • d2892b3139 [fix] Add configuration variable for Nginx #223 magikcypress 2017-04-27 14:36:02 +0200
  • 54c2021348 Sort php-fpm configs and add ENV_WHITELIST option Michael Contento 2017-04-27 14:17:43 +0200
  • 8fc2924cb7 Don't log supervisord messages twice Michael Contento 2017-04-27 09:19:54 +0200
  • 573187ea6b Only lower-case the xdebug seting name and NOT it's value Michael Contento 2017-04-27 08:24:34 +0200
  • 3d50758773 Add .dockerignore for a smaller docker build context Michael Contento 2017-04-27 07:24:18 +0200
  • 95ff0d3758 Add xdebug support and improve php configuration Michael Contento 2017-04-26 17:16:56 +0200
  • 02204a26de [fix] Add configuration variable for Nginx magikcypress 2017-04-25 17:17:33 +0200
  • a350c843f7 Merge c6e6b1fe78 into af595ed96d #125 Wikinaut 2017-04-20 18:52:05 +0000
  • af595ed96d
    Merge branch 'master' of origin rugk 2017-04-19 00:50:24 +0200
  • fa2dde0b1f
    Use SQL highlighting rugk 2017-04-19 00:49:59 +0200
  • f514381aa5
    Correct license rugk 2017-04-19 00:09:41 +0200
  • 283873d89a
    Fix stupid copy&paste error rugk 2017-04-13 10:52:48 +0200
  • 9b6748c54d
    Adjust requested changes rugk 2017-04-13 10:46:09 +0200
  • 073b52ce96
    Pass on event rugk 2017-04-11 22:36:25 +0200
  • 7eb77e90e5
    Add retry button to page template too rugk 2017-04-11 22:25:14 +0200
  • d53207e404
    Add password retry feature rugk 2017-04-11 22:21:30 +0200
  • f54036976a
    added instantburnafterreading option to address #174 El RIDO 2017-04-11 17:23:26 +0200
  • 183ebe518b
    Force JSON request for getting paste data rugk 2017-04-11 16:34:13 +0200
  • ab2e789aee
    Add JS refactor to credits rugk 2017-04-11 12:45:51 +0200
  • fb774c2f8c
    Merge branch 'js-unit-testing' El RIDO 2017-04-07 06:23:46 +0200
  • 99b0c22bf4
    Merge branch 'master' into js-unit-testing El RIDO 2017-04-07 06:19:16 +0200
  • 41701bbfe4
    trying to fix unit test execution in Travis El RIDO 2017-04-05 06:55:20 +0200
  • 8f6c1ee079
    added a check for the ZeroBin paste format (uses Base64.js v1.7) El RIDO 2017-04-05 06:46:21 +0200
  • 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) El RIDO 2017-04-04 07:43:41 +0200
  • 662b48fccf Hashes thororm 2017-04-02 19:28:25 +0200
  • 1a1369ff53 scrutinizer issues thororm 2017-04-02 19:11:49 +0200
  • ec9fb750b4 Adapted attachment handling to refactoring thororm 2017-04-02 18:58:11 +0200
  • 096f07f86e Merge branch 'master' into attachment-handling thororm 2017-04-02 13:30:52 +0200
  • f25ea35666
    Merge branch 'idarlund-patch-4' El RIDO 2017-03-29 19:43:02 +0200
  • 6470d74be3
    Merge branch 'patch-4' of https://github.com/idarlund/PrivateBin into idarlund-patch-4 El RIDO 2017-03-29 19:41:43 +0200
  • 10fe965704
    Merge branch 'stefanomarty-Italian-Translation' El RIDO 2017-03-29 19:41:07 +0200
  • 4b6ebf31c6 Add custom "hook folders" /etc/nginx/{server.d,location.d} Michael Contento 2017-03-29 19:40:24 +0200
  • 89a00ea48e
    Merge branch 'Italian-Translation' of https://github.com/stefanomarty/PrivateBin into stefanomarty-Italian-Translation El RIDO 2017-03-29 19:39:15 +0200
  • 271d123846 Fix outdated comment in Dockerfile Michael Contento 2017-03-29 19:25:50 +0200
  • 023f04c7a4 refactor REDIRECT_PROTO and add some examples Michael Contento 2017-03-29 19:23:29 +0200
  • b6c804b68c support container restarting Michael Contento 2017-03-28 21:28:56 +0200
  • a0929f0059 support php for nested routes Michael Contento 2017-03-28 21:28:32 +0200
  • 48724219b3 add REDIRECT_SCHEME to support running this image behind a SSL-termination proxy Michael Contento 2017-03-28 20:13:15 +0200
  • 190712ffc1 combine two RUN statements to keep the layers down Michael Contento 2017-03-28 19:57:54 +0200
  • 6181af05f9 initial commit Michael Contento 2017-03-28 19:46:14 +0200
  • 806b665c6a Update no.json #212 idarlund 2017-03-28 16:42:48 +0200
  • 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 El RIDO 2017-03-26 16:16:15 +0200
  • cdb62b44c7
    basic tests for CryptTool classes encryption and compression functions El RIDO 2017-03-26 11:34:19 +0200
  • 37f5d99bc4
    finalizing tests for I18n class, AJAX loading of translations needs to be tested in browser, mocked for now El RIDO 2017-03-26 09:24:42 +0200
  • e1ea14627f
    handling JSVerify RNG state 88caf85079d32e416b El RIDO 2017-03-26 06:47:57 +0200