Commit graph

1039 commits

Author SHA1 Message Date
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
El RIDO
266b71bfd0
Merge branch 'master' into js-unit-testing 2018-02-25 09:51:49 +01:00
El RIDO
a3e0418b33
working on TopNav tests 2018-02-25 09:45:51 +01:00
rugk
0687448d0a
Fix some issues from ESLint 2018-02-21 22:51:31 +01:00
rugk
904f0de245
Fix indendation 2018-02-21 22:31:01 +01:00
rugk
722d8ce7dd
Fix URL shortener not working
Move URL shortener out of #pastelink as that is overwritten by the JS.

Fixes https://github.com/PrivateBin/PrivateBin/issues/280
2018-02-21 22:28:56 +01:00
El RIDO
99972b5f7b
Merge branch 'f-breidenstein-better_dockerfile' 2018-02-20 18:15:56 +01:00
Felix Breidenstein
5602e47c5f Added docker-compose.yml 2018-02-20 12:32:02 +01:00
Felix Breidenstein
d3c3cb0c1f Dockerfile: Better handling of entrypoint.sh 2018-02-20 12:23:52 +01:00
Felix Breidenstein
8c19e869b7 Dockerfile: Define data volume and entryscript
The entryscript is needed to set correct permissions on the data
directory.
2018-02-20 12:12:32 +01:00
Felix Breidenstein
43d48ae2df Dockerfile: Remove empty line in RUN command
This will throw errors in future Docker versions
2018-02-20 11:11:12 +01:00
Felix Breidenstein
82dc08e7e7 Dockerfile: Use correct libpng package for Debian Stretch 2018-02-20 11:08:30 +01:00
Felix Breidenstein
460d7ec3eb Dockerfile: Be more specific about the path
Without looking at the php:apache image, it is unclear what
the destination of the COPY command is
2018-02-20 10:59:04 +01:00
Felix Breidenstein
c9b0398df0 Dockerfile: User && instead of ;
We don't want to continue if any of the commands fails.
&& only executes the next command on exitocde 0.
2018-02-20 10:58:07 +01:00
El RIDO
0041445e5f
starting to test TopNav 2018-01-06 18:39:12 +01:00
rugk
9c132cd839
Disallow form-action in CSP to limit outgoing connections
See https://github.com/PrivateBin/PrivateBin/issues/272
2018-01-06 18:06:06 +01:00
El RIDO
882f8d43bc
let JSHint use the globals in privatebin.js 2018-01-06 15:17:27 +01:00
El RIDO
82f2016214
removing PHPCS from CodeClimate, since it can't be configured and contradicts our code style enforced by other checkers 2018-01-06 15:10:21 +01:00
El RIDO
7e4c59143b
tuning CodeClimate configuration 2018-01-06 15:04:41 +01:00
El RIDO
59544da21f
tuning ESlint & JSHint 2018-01-06 14:44:18 +01:00
El RIDO
341131e5ed
correcting CodeClimate configuration 2018-01-06 14:23:08 +01:00
El RIDO
869198b8dd
tuning ESlint & JSHint 2018-01-06 14:20:05 +01:00
El RIDO
f179e75e72
updating CodeClimate configuration 2018-01-06 13:56:03 +01:00
El RIDO
ffae6111b0
handling further JSHint warnings and TODOs 2018-01-06 13:32:07 +01:00
El RIDO
98d07e0789
improving code quality issues reported by Codacy 2018-01-06 10:57:54 +01:00
El RIDO
3bca559826
moving access to into Request class 2018-01-06 10:27:58 +01:00
El RIDO
d92755f030
undoing code style regression 2018-01-06 09:58:19 +01:00
El RIDO
72acc95326
improving code quality issues suggested by JSHint 2018-01-06 09:26:10 +01:00
El RIDO
49fffbb876
adding some pre defined variables from common.js to the JSHint rules 2018-01-06 08:24:42 +01:00
El RIDO
56dab60427
correcting quote style enforced by JSHint and trying to get Codacy coverage reports to work again 2018-01-06 08:19:00 +01:00
El RIDO
917f2dfa2b
add Node Security configuration and enabling it in CodeClimate 2018-01-06 08:06:09 +01:00
El RIDO
f90ad11bcd
adding JSHint configuration 2018-01-06 08:05:27 +01:00
El RIDO
2db412873b
implementing ESlint suggestions 2018-01-06 07:17:33 +01:00
El RIDO
5e070db6a1
reverting escaping just for Markdown formatting, as discussed in #269 2018-01-03 21:18:33 +01:00
El RIDO
a95701bba8
completing DiscussionViewer testing 2018-01-02 15:38:37 +01:00
El RIDO
fcb4249e01
actually IDs are hexadecimal, not base64, so not a problem 2018-01-02 11:51:11 +01:00
El RIDO
95bf37be8f
implementing DiscussionViewer test, found an issue with slashes in the paste or comment IDs (as per Base64 encoding) 2018-01-02 11:44:54 +01:00
El RIDO
28f1f41c17
removing duplicate code and unused option 2018-01-02 11:42:03 +01:00
El RIDO
49feb300b6
further tweaking travis CI scripts 2018-01-02 09:38:28 +01:00
El RIDO
85401a1513
Merge branch 'master' into js-unit-testing 2018-01-02 09:37:46 +01:00
El RIDO
6eb8822059
optimizing PNG 2018-01-02 08:44:38 +01:00
El RIDO
dae11fdd16
Merge branch 'qrcode' 2018-01-02 08:43:42 +01:00
El RIDO
6ce0fe55f6
revert as per StyleCI: missed one 2018-01-02 08:41:45 +01:00
El RIDO
f135dd2667
Hrmpf, StyleCI only allows the use of either tabs or spaces for PHP code, forcing me to revert the use of tabs in the templates 2018-01-02 08:31:12 +01:00
El RIDO
ec3ed1e5ff
removing unused code and reducing size of HTML in case QR code is turned off 2018-01-02 08:23:11 +01:00
El RIDO
98a8591a27
naming JS libraries consistently 2018-01-02 08:01:39 +01:00