El RIDO
1badd5e542
applying HTML entity cleanup to raw paste, too, fixing #137
2016-12-25 13:04:06 +01:00
El RIDO
97cbcb0aab
Merge branch 'PunKeel-add-dockerfile'
2016-12-25 12:35:07 +01:00
El RIDO
eca37c2184
Merge branch 'add-dockerfile' of https://github.com/PunKeel/PrivateBin into PunKeel-add-dockerfile
2016-12-25 12:32:14 +01:00
El RIDO
f6b8ee3e20
add missing check for non-expiring pastes, fixes #149
2016-12-25 12:15:29 +01:00
El RIDO
577031cc1f
written unit test to reproduce #149
2016-12-25 12:04:47 +01:00
El RIDO
3d6676eee8
Merge branch 'r4sas-master'
2016-12-25 11:38:12 +01:00
El RIDO
ecd8a51137
writing a unit test for #145 lead to the discovery of two errors in the polish translations: error in formula and missing number placeholders in the translation strings
2016-12-25 11:37:45 +01:00
El RIDO
fc874fe448
Merge branch 'master' of https://github.com/r4sas/PrivateBin into r4sas-master
2016-12-25 11:00:36 +01:00
El RIDO
0506ac018d
correcting instructions based on Ubuntu 16.04
2016-12-25 10:58:35 +01:00
PunKeel
77f464f650
Add .dockerignore
2016-12-23 20:01:17 +01:00
PunKeel
f45367fac2
Add a Dockerfile
...
This is not a perfect Dockerfile, but is a perfect base for anyone willing to run PrivateBin
inside a container. There are a lot of ways to improve it, first being "having configuration
in environment variables".
Anyway, this Dockerfile is great as a basis, and it is possible to "fork" the image and add
our own config file into it.
Another improvement might be "adding a docker-compose.yml full stack, with mysql+bin".
Feel free to do it \o/
2016-12-23 18:56:49 +01:00
r4sas
aacfe8e5fa
added a forgotten option 'ru' in supportedLanguages section
2016-12-19 17:26:04 +03:00
atnaguzin
bbcc53f08e
StyleCI fix
2016-12-16 12:25:10 +03:00
atnaguzin
2847bbc45d
added ru plural formula, updated template for edited privatebin.js
2016-12-16 12:21:15 +03:00
R4SAS
ccba2f029f
added ru plural formula
2016-12-16 12:15:37 +03:00
R4SAS
6ff5caf758
JavaScript
2016-12-16 12:13:28 +03:00
R4SAS
94aab2977d
Merge pull request #2 from PrivateBin/master
...
upstream pull
2016-12-16 12:12:22 +03:00
rugk
90e0bf6058
Merge branch 'tables'
2016-12-14 19:03:58 +01:00
rugk
aab6bd83c9
Merge branch 'JSnotWorkingError'
2016-12-14 19:02:54 +01:00
R4SAS
08a34fda82
update russian translation
2016-12-14 19:42:17 +03:00
rugk
58bd603c7c
Use nice condensed table with border
...
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01:00
R4SAS
8d73a81582
Added Russian translation
2016-12-14 01:21:11 +03:00
rugk
d6255f64e4
German translation: lower case for 'du'
...
Writing 'Du' with a capital letter is an older style of writing it.
'du' is muich better.
(Of course, we could also introduce a 'Sie' version, but that's another thing)
2016-12-13 23:20:50 +01:00
R4SAS
4a85ced4b1
Merge pull request #1 from PrivateBin/master
...
upstream pull
2016-12-14 01:19:42 +03:00
rugk
ac53f0abdb
Add translation string
2016-12-13 23:19:19 +01:00
rugk
0831ece7cd
Merge branch 'master' into JSnotWorkingError
2016-12-12 19:31:00 +01:00
rugk
67094022dd
Remove code duplication
2016-12-12 19:29:29 +01:00
rugk
124d1de3eb
Remove accidentially added file
2016-12-12 19:09:08 +01:00
rugk
da10a761c4
Fix more typos
2016-12-12 18:50:00 +01:00
rugk
61ee0ef7d3
Fix typos
2016-12-12 18:49:08 +01:00
rugk
658d5ae84d
Fix style-ci errors
2016-12-12 18:43:23 +01:00
rugk
bdf1586539
Add FAQ link & add to all templates
2016-12-12 18:37:54 +01:00
rugk
f755a99ab8
Add table class to parsed Markdown
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/140
2016-12-12 17:37:51 +01:00
El RIDO
b94d252421
Merge branch 'master' into JSnotWorkingError
2016-11-13 18:30:14 +01:00
El RIDO
3f2de319f3
should use typesafe comparison in JS and adding forgotten modal dialog in bootstrap-dark-page
2016-11-13 18:22:37 +01:00
El RIDO
0493cf4463
Merge branch 'aldem-modal-decryption-password'
2016-11-13 18:12:47 +01:00
El RIDO
3f8d6a592b
refactored modal dialog logic, added the new message IDs to all translation files and added the modal dialog to all bootstrap based templates (page gets the old JS input as a fallback)
2016-11-13 18:12:10 +01:00
El RIDO
f7feff50d8
Merge branch 'aldem-modal-decryption-password' of https://github.com/aldem/PrivateBin into aldem-aldem-modal-decryption-password
2016-11-13 12:54:39 +01:00
El RIDO
c2aa931392
updated changelog and fixed missing translation and CSS change
2016-11-13 12:38:55 +01:00
El RIDO
70482a4fc0
Merge branch 'master' into JSnotWorkingError
2016-11-13 12:30:11 +01:00
El RIDO
9dcdb3172c
added translation string to JSON files, removed unneccessary class (already covered by bootstrap CSS) and moved noscript CSS load into head (allowed when not using XHTML)
2016-11-13 12:27:09 +01:00
El RIDO
f49927712a
updated documentation and credits
2016-11-13 11:01:51 +01:00
Alexander Demenshin
71a94271a7
Added German translations for modal password dialog
2016-11-13 00:44:49 +01:00
Alexander Demenshin
1b0095b54a
Added localization for modal password dialog
2016-11-13 00:42:52 +01:00
Alexander Demenshin
1c643191ce
Updated intergrity hash for privatebin.js
2016-11-12 18:32:39 +01:00
Alexander Demenshin
2c8a780c74
Removed unreachable code
2016-11-12 18:30:42 +01:00
Alexander Demenshin
6544fc8a49
Proper indenting and fix for "label for"
2016-11-12 18:21:33 +01:00
Alexander Demenshin
e8248020dd
Updated integrity hash
2016-11-11 18:53:35 +01:00
Alexander Demenshin
c916f33a83
More js for modal password request
2016-11-11 18:46:44 +01:00
Alexander Demenshin
c1ca5657b5
Removed unnecessary attributes from modal password form
2016-11-11 18:41:41 +01:00
