Commit Graph

2359 Commits

Author SHA1 Message Date
rugk 567fa8b61f
Add semicolon required by codacy 2018-05-22 11:43:44 +02:00
rugk 0b98e444d6
Update SRI hashes 2018-05-22 11:42:28 +02:00
rugk 1bf910480b
Do not show error, when paste is deleted manually
Prior to this commit, if the paste has been deleted manually (clicking
on "delete paste" after creation) it tried to fetch the now deleted
paste and display an error. This makes, of course, no sense.
2018-05-22 11:41:35 +02:00
rugk 626b4450e3
Merge branch 'master' into burnafterreading-fix 2018-05-22 10:57:30 +02:00
rugk 733cc70967
Improve code style of function names
Thx
429d43dc78 (r29068381)
2018-05-22 10:19:53 +02:00
rugk 429d43dc78
Make some functions of AttachmentHandler private
They are only used/referenced in the same module, so there is no need to
make them public.
2018-05-22 00:43:24 +02:00
rugk 14a7fd7091
Fix https://github.com/PrivateBin/PrivateBin/issues/315
Fixes some display issues related to file display.
2018-05-22 00:41:02 +02:00
rugk da45d347e2
Fix attachment issues
Fixes https://github.com/PrivateBin/PrivateBin/issues/315
The attachment viewer is also used for storing to be uploaded
attachments, which caused some confusion in handling them.
I also tried to add some comments clarifying it as it seems to work.

Additionally I fixed the issue that you could submit an empty paste and
it was not rejected.
2018-05-21 19:32:01 +02:00
Michael van Schaik 923521b9c0
Correct %s replacements & missing strings 2018-05-21 16:35:19 +02:00
Michael van Schaik 8ab7162c78
Update: replace 'PrivateBin' with %s 2018-05-21 06:20:11 +02:00
Michael van Schaik fe4b8e0e94
Fix some typos in nl.json 2018-05-18 15:54:15 +02:00
Michael van Schaik 652ba607a5
Adding 'nl' (Dutch) language to privatebin.js
(Security hash needs to be regenerated)
2018-05-18 06:36:35 +02:00
Michael van Schaik 32b20ebc68
Create nl.json - Dutch translation 2018-05-18 06:33:56 +02:00
El RIDO caf87cc6f1
Merge branch 'master' into burnafterreading-fix, regression in expired paste error 2018-04-30 20:01:38 +02:00
El RIDO db7c7e2e16
Merge branch 'otaku-fixbootstrap' 2018-04-30 18:26:58 +02:00
El RIDO b618bad51c
minor fix 2018-04-30 18:26:33 +02:00
El RIDO df88db926d
Merge branch 'fixbootstrap' of https://github.com/otaku/PrivateBin into otaku-fixbootstrap 2018-04-30 18:11:20 +02:00
rugk 7ba968ce1d
Merge branch 'Quenty31-patch-1' 2018-04-30 17:59:20 +02:00
Quentí 580b5393c2
Update Occitan translation 2018-04-30 15:29:21 +02:00
Alexander Do 1648780269 Fix bootstrap template 2018-04-30 05:45:40 +00:00
El RIDO 30de630bfb
Merge branch 'thororm-attachment-handling' 2018-04-29 12:00:28 +02:00
El RIDO 2c82279292
Merge branch 'attachment-handling' of https://github.com/thororm/PrivateBin into thororm-attachment-handling
apart from resolving conflicts:
- added missing docs
- inlined functions that were used in only one location
- updated unit test to support all previews
- fixed a regression that displayed the preview even when there was no preview and too early
2018-04-29 11:57:03 +02:00
El RIDO 939a62ab2c
Merge branch 'otaku-blob' 2018-04-29 10:29:25 +02:00
El RIDO de4b96c5ed
Merge branch 'blob' of https://github.com/otaku/PrivateBin into otaku-blob 2018-04-29 10:28:40 +02:00
El RIDO 3f508b737c
adding npm mime-types dependency, missing in travis CI 2018-04-29 09:40:44 +02:00
El RIDO e4bf41202e
Merge branch 'master' into js-unit-testing 2018-04-29 08:53:59 +02:00
Alexander Do 5bee666a6b Update SRI hashes 2018-04-09 16:40:10 +00:00
Alexander Do 2fce7bb96a Merge branch 'master' of github.com:PrivateBin/PrivateBin into blob 2018-04-09 16:36:23 +00:00
Alexander Do 3f28f01b0e Switch from bind / unbind to on / off 2018-04-09 15:57:58 +00:00
rugk 3b90020559
Add explanation
Ref https://github.com/PrivateBin/PrivateBin/pull/297#issuecomment-379586428
2018-04-09 14:13:18 +02:00
Alexander Do 60cedd7fb5 Only create Blob for Download for IE upon click event 2018-04-09 04:44:37 +00:00
Alexander Do 2925fa8bfc Requested Changes, IE Download fix only 2018-04-08 22:36:55 +00:00
rugk cb6a6200b9
Add missing license for kjua 2018-04-08 23:33:30 +02:00
rugk b85dab4633
Merge branch 'otaku-lang' 2018-04-08 23:17:45 +02:00
rugk 09a04b96c0
Update SRI hashes 2018-04-08 23:09:13 +02:00
Alexander Do d3b8ef44ed Download Attachment changes. Support for Edge and change to Blob 2018-04-07 06:59:26 +00:00
Alexander Do 944c8c2912 Add test for missing browser language 2018-04-07 03:22:26 +00:00
Alexander Do c6950b9b56 Default to en if browser does not provide a language 2018-04-07 02:53:00 +00:00
El RIDO 3538a8bec5
concluding tests for TopNav 2018-03-04 14:55:18 +01:00
El RIDO 4857a92a0e
testing file input access 2018-03-04 14:13:24 +01:00
El RIDO 78c186d6bc
avoid StyleCI complaint 2018-03-04 13:19:49 +01:00
El RIDO 0938b59b90
attributes contain strings, not booleans 2018-03-04 11:47:58 +01:00
El RIDO 76debde85b
found and fixed a bug in TopNav.collapseBar() while writing test for it 2018-03-03 07:55:27 +01:00
El RIDO ce6764e97d
introduce built in asserts, working on TopNav, correcting some docs 2018-03-01 06:43:30 +01:00
El RIDO b40e6305ca
Merge branch 'master' into empty-paste 2018-02-27 05:20:04 +01:00
El RIDO cb2af8687e
Merge branch 'master' into js-unit-testing 2018-02-25 10:20:07 +01:00
El RIDO df921ad658
fixing licence identifier according to spdx.org for Packagist / composer 2018-02-25 10:18:43 +01:00
El RIDO eb57a95392
Merge branch 'fixurlshortener' 2018-02-25 10:11:17 +01:00
El RIDO 4653085d2e
Merge branch 'master' into fixurlshortener 2018-02-25 10:10:05 +01:00
El RIDO d07f8d8f96
fixing indentation, replicating change to other template 2018-02-25 10:09:19 +01:00