Commit Graph

1279 Commits

Author SHA1 Message Date
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
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