rugk
851c5135fc
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin
2018-06-21 12:50:08 +02:00
rugk
6134e68daa
Deduplicate installation instructions
...
@elrido, please don't re-add them. We should keep them in one place, i.e.
in the wiki here. Otherwise one version will always get outdated.
Of course, we could also remove that file here.
2018-06-21 12:48:26 +02:00
El RIDO
9f8b3433ae
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2018-06-16 11:02:48 +02:00
Michael van Schaik
9d96923b12
Update nl.json
...
Fixed small typo
2018-06-11 20:29:51 +02:00
El RIDO
6225a8ef16
updating translators in credits
2018-06-11 20:29:47 +02:00
El RIDO
1d87eb01ab
updating translators in credits
2018-05-31 21:04:35 +02:00
rugk
2ff5491752
Merge branch 'Peneheals-hungarian-translation'
2018-05-31 17:42:41 +02:00
rugk
848efde4a6
Regenerate SRI hashes
2018-05-31 17:42:21 +02:00
Peter Tabajdi
3eb4acfd32
New Hungarian translation file and languange selector added to js.
2018-05-31 17:07:42 +02:00
El RIDO
9a0318517b
correct PHPdoc, fixes #264
2018-05-27 15:18:25 +02:00
El RIDO
4ccb4b1af4
Merge branch 'burnafterreading-fix'
2018-05-27 15:06:23 +02:00
El RIDO
d6f203dc4c
Removed option to hide clone button on expiring pastes, since this requires reading the paste for rendering the template, which leaks information on the pastes state
2018-05-27 15:05:31 +02:00
El RIDO
05c1776ada
ensure ALL read errors are only exposed in the JSON API to avoid information leakage (i.e. beviour for deleted vs expired pastes), updated test cases & removed duplicate test
2018-05-27 14:36:30 +02:00
El RIDO
e511613bbc
StyleCI recommendations
2018-05-27 14:16:47 +02:00
El RIDO
6cf599781a
corrected test case of expired paste to use the API
2018-05-27 14:10:54 +02:00
El RIDO
2d09a6d73c
Merge branch 'master' into burnafterreading-fix
2018-05-27 14:00:38 +02:00
El RIDO
57754fa440
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2018-05-27 13:49:11 +02:00
El RIDO
378a259cde
Merge branch 'restruct-master'
2018-05-27 13:44:57 +02:00
El RIDO
c3db83aa12
fixing message IDs, updating SRI hashes
2018-05-27 13:44:40 +02:00
rugk
1985dff67c
Clear file input on pste event, too
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/318
2018-05-22 13:09:15 +02:00
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
