Commit Graph

652 Commits

Author SHA1 Message Date
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
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
rugk 58bd603c7c
Use nice condensed table with border
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01: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
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
Alexander Demenshin 09fa46a651 Added relevant js to modal password form 2016-11-11 18:39:38 +01:00
Alexander Demenshin 0fbeefb199 Added modal decryption password request 2016-11-11 18:28:20 +01:00
rugk bfe595e1a1
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2016-11-08 16:56:16 +01:00
rugk 3b1eb64386
Update random_compat to v2.0.4 2016-11-08 16:52:43 +01:00
El RIDO d6c445092f
Merge branch 'styleci' 2016-11-01 06:30:37 +01:00
El RIDO 8619f4248b
Merge branch 'master' into styleci 2016-11-01 06:29:33 +01:00
rugk 64e1e0d7c4
Merge branch 'master' 2016-10-31 12:20:29 +01:00
rugk f9149595c9
Change alert to loading info message 2016-10-31 12:20:07 +01:00
rugk f628ac78f8
Fix style of operator spaces 2016-10-31 11:32:12 +01:00
rugk b4293f5467
Add missing fixers from PHP CS
Also adjust editorconfig and order php-cs.
2016-10-31 11:29:25 +01:00
El RIDO bd30ae419a
Merge branch 'nolsen42-master' 2016-10-29 12:24:25 +02:00
El RIDO 375dac759f
renamed jQuery file to match projects JS file naming convention 2016-10-29 12:18:03 +02:00
El RIDO f093b05330
update jQuery from 1.11.3 to 3.1.1 2016-10-29 12:12:22 +02:00
El RIDO 1f46823942
applying patch based on StyleCI ruleset 2016-10-29 10:24:08 +02:00
El RIDO c8b1296929
add adjusted StyleCI ruleset 2016-10-29 10:19:09 +02:00
rugk 7bbb273c1c
Add "JS not working" error message
It is:
* hidden by JS code executed as early as possible
* not hidden by noscript tags, so that it is *not* shown when JavaScript is just no activated

Fix https://github.com/PrivateBin/PrivateBin/issues/103
2016-10-25 21:13:43 +02:00
rugk 5d822af5b1
Regenerate JS hashes & sign commit 2016-10-25 19:03:20 +02:00
El RIDO b80665cc45 Merge pull request #121 from stefanomarty/Italian-translation
Italian translation
2016-10-23 21:58:31 +02:00