36f70cad48
Fixed a spelling error in conf.ini
...
Changed "Mibibytes" to "Megabytes"
2017-01-01 17:47:07 -06:00
a5d91298ff
add an option to change the site name, solves #154
2017-01-01 16:33:11 +01:00
f5dd327488
Merge branch 'Ahuahuachi-master'
2017-01-01 14:37:31 +01:00
4a036aea80
updated SRI hashes, added missing formula for slowene plurals and unit test for it, updated credits and changelog
2017-01-01 14:35:39 +01:00
910c3b3f9d
Add Spanish to supported languages
2016-12-30 20:40:23 -06:00
6f8f4076dc
Create es.json
...
Added translation file for spanish support
2016-12-30 20:37:58 -06:00
e505f8ab71
excluding some development files from being packaged
2016-12-26 12:19:33 +01:00
1426d4e371
tagging 1.1 release and updating documentation
2016-12-26 12:13:50 +01:00
1badd5e542
applying HTML entity cleanup to raw paste, too, fixing #137
2016-12-25 13:04:06 +01:00
97cbcb0aab
Merge branch 'PunKeel-add-dockerfile'
2016-12-25 12:35:07 +01:00
eca37c2184
Merge branch 'add-dockerfile' of https://github.com/PunKeel/PrivateBin into PunKeel-add-dockerfile
2016-12-25 12:32:14 +01:00
f6b8ee3e20
add missing check for non-expiring pastes, fixes #149
2016-12-25 12:15:29 +01:00
577031cc1f
written unit test to reproduce #149
2016-12-25 12:04:47 +01:00
3d6676eee8
Merge branch 'r4sas-master'
2016-12-25 11:38:12 +01:00
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
fc874fe448
Merge branch 'master' of https://github.com/r4sas/PrivateBin into r4sas-master
2016-12-25 11:00:36 +01:00
0506ac018d
correcting instructions based on Ubuntu 16.04
2016-12-25 10:58:35 +01:00
77f464f650
Add .dockerignore
2016-12-23 20:01:17 +01:00
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
aacfe8e5fa
added a forgotten option 'ru' in supportedLanguages section
2016-12-19 17:26:04 +03:00
bbcc53f08e
StyleCI fix
2016-12-16 12:25:10 +03:00
2847bbc45d
added ru plural formula, updated template for edited privatebin.js
2016-12-16 12:21:15 +03:00
ccba2f029f
added ru plural formula
2016-12-16 12:15:37 +03:00
6ff5caf758
JavaScript
2016-12-16 12:13:28 +03:00
94aab2977d
Merge pull request #2 from PrivateBin/master
...
upstream pull
2016-12-16 12:12:22 +03:00
90e0bf6058
Merge branch 'tables'
2016-12-14 19:03:58 +01:00
aab6bd83c9
Merge branch 'JSnotWorkingError'
2016-12-14 19:02:54 +01:00
08a34fda82
update russian translation
2016-12-14 19:42:17 +03:00
58bd603c7c
Use nice condensed table with border
...
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01:00
8d73a81582
Added Russian translation
2016-12-14 01:21:11 +03:00
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
4a85ced4b1
Merge pull request #1 from PrivateBin/master
...
upstream pull
2016-12-14 01:19:42 +03:00
ac53f0abdb
Add translation string
2016-12-13 23:19:19 +01:00
0831ece7cd
Merge branch 'master' into JSnotWorkingError
2016-12-12 19:31:00 +01:00
67094022dd
Remove code duplication
2016-12-12 19:29:29 +01:00
124d1de3eb
Remove accidentially added file
2016-12-12 19:09:08 +01:00
da10a761c4
Fix more typos
2016-12-12 18:50:00 +01:00
61ee0ef7d3
Fix typos
2016-12-12 18:49:08 +01:00
658d5ae84d
Fix style-ci errors
2016-12-12 18:43:23 +01:00
bdf1586539
Add FAQ link & add to all templates
2016-12-12 18:37:54 +01:00
f755a99ab8
Add table class to parsed Markdown
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/140
2016-12-12 17:37:51 +01:00
b94d252421
Merge branch 'master' into JSnotWorkingError
2016-11-13 18:30:14 +01:00
3f2de319f3
should use typesafe comparison in JS and adding forgotten modal dialog in bootstrap-dark-page
2016-11-13 18:22:37 +01:00
0493cf4463
Merge branch 'aldem-modal-decryption-password'
2016-11-13 18:12:47 +01:00
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
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
c2aa931392
updated changelog and fixed missing translation and CSS change
2016-11-13 12:38:55 +01:00
70482a4fc0
Merge branch 'master' into JSnotWorkingError
2016-11-13 12:30:11 +01:00
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
f49927712a
updated documentation and credits
2016-11-13 11:01:51 +01:00
Jordyn Carattini