Commit Graph

1290 Commits

Author SHA1 Message Date
El RIDO d35ae4685c
Merge branch 'patch-1' of https://github.com/tupaschoal/PrivateBin into tupaschoal-patch-1 2017-03-25 01:01:46 +01:00
El RIDO bbcc3e167b
implementing recommendations of scrutinizer 2017-03-25 00:58:59 +01:00
Tulio Leao 3be736fa1d Update pt.json to reflect latest string changes
Just a minimal change on the translation.
2017-03-24 20:03:08 -03:00
El RIDO 9b2af0abf5
fixing documentation 2017-03-24 23:54:37 +01:00
El RIDO 18315e7de0
removing unused class 2017-03-24 23:45:10 +01:00
El RIDO f7853cf439
removing duplicate code, cleanup of temporary test files 2017-03-24 23:42:11 +01:00
El RIDO 6db9dae66b
applying styleCI recommendations 2017-03-24 21:35:50 +01:00
El RIDO b2ea65f820
Merge branch 'master' of github.com:PrivateBin/PrivateBin 2017-03-24 21:30:19 +01:00
El RIDO ce92bfa934
updated .htaccess format, refactored .htaccess creation logic and improving code coverage, fixes #194 2017-03-24 21:30:08 +01:00
Kyodev 1cb1c1ced8 php minimum version + constant version 2017-03-24 20:34:35 +01:00
Kyodev 850b28931f php minimum version updated 2017-03-24 19:56:52 +01:00
El RIDO 88b02d866e
fixes #186 for good 2017-03-24 19:20:34 +01:00
El RIDO e5f4104720
Merge branch 'imtms-master' 2017-03-24 19:01:40 +01:00
El RIDO ebd8913027
Merge branch 'stefanomarty-Italian-Translation' 2017-03-24 18:59:00 +01:00
rugk b8d057860c
Merge branch 'locale-ru' of https://github.com/r4sas/PrivateBin 2017-03-24 18:18:25 +01:00
R4SAS a6b9bc6879 replace php version to constant, #186 #201 2017-03-24 17:50:53 +03:00
TMs 02e0b8655d update zh translation 2017-03-24 11:32:12 +01:00
rugk 2d9225d8a3
Merge branch 'r4sas-locale-ru' 2017-03-23 21:20:35 +01:00
R4SAS 9a788d63ee fixed wrong translated line 2017-03-23 21:25:44 +03:00
R4SAS 01701efd56 changed three dots to unicode symbol, added note about english 2017-03-23 21:20:52 +03:00
Stefano Martinelli 39bb2fa389 php minimum version updated
As per instructions, minimum version updated from 5.3.0 to 5.4.0
2017-03-23 17:36:13 +01:00
R4SAS e58261b3f8 update ru translation 2017-03-23 18:36:08 +03:00
R4SAS a165094d4c Merge pull request #2 from PrivateBin/master
upstream pull
2017-03-23 19:27:06 +04:00
Stefano Martinelli 037a312b8f Italian translation update
New message translated, couple of minor errors fixed and translation of
row 70 reverted to a more faithful meaning.
2017-03-22 20:27:19 +01:00
Stefano Martinelli e4c30e8613 Merge remote-tracking branch 'PrivateBin/master' 2017-03-22 18:46:53 +01:00
rugk 63e00445d1
Merge branch 'chauffer-patch-1' 2017-03-21 20:54:55 +01:00
Simone Esposito 21df49c7cd README: Fix some grammar mistakes 2017-03-21 20:44:46 +01:00
rugk eebac929c5
Merge branch 'kyodev-patch-1' 2017-03-21 14:39:38 +01:00
Kyodev 8f13dffd7c fr translation completed 2017-03-17 22:23:01 +01:00
El RIDO fcb718dfda
Merge branch 'imtms-master' 2017-03-13 21:19:10 +01:00
El RIDO be78dcd1a5
Merge branch 'master' of https://github.com/imtms/PrivateBin into imtms-master 2017-03-13 21:18:32 +01:00
El RIDO 996a22380e
Merge branch 'jsrefactor' 2017-03-13 21:16:33 +01:00
El RIDO 0fb650c3a6
comply with codacys suggestion 2017-03-13 21:15:52 +01:00
El RIDO 63617ade72
Merge branch 'master' into jsrefactor 2017-03-13 21:13:06 +01:00
El RIDO b5cdfff3e3
fix missing comment status messages - ♫ lovely span, oh wonderful span ♪ (chorus) span, span, span, span, … 2017-03-13 21:11:26 +01:00
El RIDO 5bf25f227e
update JSDoc and re-published to https://privatebin.info/jsdoc/ 2017-03-13 20:24:18 +01:00
El RIDO ee43557a4f
ensure burn after reading and status messages are only changed after a successfull decryption 2017-03-13 19:30:44 +01:00
El RIDO 9deaed9406
working on asynch translation handling 2017-03-12 17:08:12 +01:00
El RIDO 1649ff34f5
restoring password protection 2017-03-12 16:06:17 +01:00
El RIDO 651e38acbe
make travis use phpunit < 6 to avoid failing builds for PHP 7, see: https://github.com/travis-ci/travis-ci/issues/7226#issuecomment-285852088 2017-03-12 14:38:49 +01:00
El RIDO 81b00dd422
fixing page template, removing error messages when markdown or source are disabled in configuration, re-removing unnecessary spans 2017-03-12 14:16:08 +01:00
TMs 9b936a5e47 Update zh.json - Add missing translations 2017-03-11 19:00:20 +08:00
El RIDO be0919893d
updating shipped .htaccess files for Apache 2.4 as per https://httpd.apache.org/docs/2.4/upgrading.html#access - Thanks @EchoDev, fixes #194 2017-03-11 08:56:14 +01:00
El RIDO 97171ec1f8
updated eslint config file format and loosening complexity and max-statements to reduce mail flood 2017-03-06 20:10:10 +01:00
El RIDO b6d8d0f250
found problem with unit test of baseUri function, makes code much simpler 2017-03-06 19:48:07 +01:00
El RIDO fb99d5bb93
Merge branch 'master' into jsrefactor and fixing baseUri unit test 2017-03-05 12:11:55 +01:00
El RIDO 823adb78ef
bumping required PHP to 5.4, removing unneccessary code, resolves #186 2017-03-05 11:22:24 +01:00
El RIDO db429d42d2
Merge branch 'nolsen42-master' 2017-03-05 11:11:06 +01:00
El RIDO bd32a73d21
remove Safari link on bootstrap template, too 2017-03-05 11:10:52 +01:00
El RIDO 89f2a3701c
Merge branch 'master' of https://github.com/nolsen42/PrivateBin into nolsen42-master 2017-03-05 11:05:29 +01:00