1
0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-10 18:14:00 +02:00

636 Commits

Author SHA1 Message Date
Marco Dickert
f40037b7fd add drag&drop feature 2017-07-28 13:10:51 +02:00
Marco Dickert
392d990288 Merge branch 'issue-47' 2017-07-28 01:40:05 +02:00
Marco Dickert
325ba6265f lazy loading of folder tree in copy/move dialog; closes #47 2017-07-28 01:38:46 +02:00
Marco Dickert
fae9a50a0d Update README.md 2017-07-27 23:24:39 +02:00
Marco Dickert
fd7fdc217e update security information 2017-07-27 23:23:03 +02:00
Marco Dickert
9035f41f4f disable showing of .ht files, as this is a potential security flaw 2017-07-27 23:15:05 +02:00
Marco Dickert
0c0cf0f78e Merge branch 'master' of github.com:misterunknown/ifm 2017-07-27 22:38:32 +02:00
Marco Dickert
302d4ab0e1 fixed error while reading forbiddenchars from environment 2017-07-27 22:36:58 +02:00
Marco Dickert
f649dcbc92 Update archive file formats 2017-07-27 15:52:35 +02:00
Marco Dickert
ca233e534d read configuration from environment variables 2017-07-27 15:35:08 +02:00
Marco Dickert
0b6b059d6b Add missing requirement php-openssl 2017-07-27 13:21:53 +02:00
Marco Dickert
835ce53269 Merge pull request #66 from digitalmobil/fix/docker-missing-openssl-support
Add missing php openssl module
2017-07-27 13:20:56 +02:00
Marco Dickert
33558cf2a3 Adjusted requirements 2017-07-27 12:31:13 +02:00
Tuschl
541a3b44fc Add missing php openssl module
The 'file' remote upload variant requires the php openssl module for
https support. Adding the corresponding alpine package.
2017-07-27 12:30:49 +02:00
Marco Dickert
0a0961c54e Merge pull request #65 from digitalmobil/fix/docker-missing-phar-support
Add php phar module for extended archive support
2017-07-27 12:14:12 +02:00
Tuschl
eb64b453e9 Add php phar module for extended archive support
The support for additional archive formats introduced with #44 requires
the php phar module.

Therefore adding the corresponding alpine package to the docker image.
2017-07-27 12:05:34 +02:00
Jannis Rondorf
438af47ffa I18N test 2017-07-27 09:34:33 +02:00
Marco Dickert
8865faef67 Merge pull request #60 from digitalmobil/docker/add-config-env-vars
Docker - add config env vars
2017-07-26 16:34:05 +02:00
Marco Dickert
79e6604092 Merge pull request #58 from misterunknown/issue-53
Issue 53, finally :)
2017-07-26 16:24:47 +02:00
Marco Dickert
b4b9550d71 remove some debug outputs 2017-07-26 16:18:25 +02:00
Marco Dickert
c8e3d31e9b reintroduce getScriptRoot() because dirname(__FILE__) does not work when using libifm.php 2017-07-26 15:36:31 +02:00
Marco Dickert
cddec16abf fixed broken entries in the copy/move dialog due to missing encoding 2017-07-26 13:04:29 +02:00
Tuschl
eb7130063a Add documentation for docker env vars
Also, move docker documentation further down to be less invasive
2017-07-26 10:52:41 +02:00
Marco Dickert
cf98fc371d fix merge conflicts 2017-07-26 10:51:38 +02:00
Marco Dickert
328073e6ef fixed encoding of href attribute; use dirname( __FILE__ ) instead of getSCriptRoot() 2017-07-26 10:48:58 +02:00
Tuschl
6e645aaced Minor whitespace, format and naming adjustments 2017-07-26 09:09:56 +02:00
Tuschl
b6372dcf17 Support changing ifm configuration via docker env vars 2017-07-26 09:06:56 +02:00
Marco Dickert
995fefccdb fix merge conflicts 2017-07-26 02:42:42 +02:00
Marco Dickert
081f662416 fixed wrong reference to forbiddenChars 2017-07-26 02:40:13 +02:00
Marco Dickert
0c8f058b81 fix merge conflict 2017-07-26 02:39:40 +02:00
Marco Dickert
ef9b5c940a spread the isFilenameValid function 2017-07-26 02:37:21 +02:00
Marco Dickert
60b46079fa Merge branch 'master' of github.com:misterunknown/ifm 2017-07-26 02:36:46 +02:00
Marco Dickert
8b02b57a41 added support for archive file types: tar, tar.gz, tar.bz2, tgz
closes #44
2017-07-26 02:35:06 +02:00
Marco Dickert
3fe9afdd08 Merge branch 'issue-53' of github.com:misterunknown/ifm into issue-53 2017-07-26 00:36:38 +02:00
Marco Dickert
5dd571d288 fixed correct handling of special characters in filenames in html attributes 2017-07-26 00:30:13 +02:00
Marco Dickert
b52e5b3468 Merge pull request #59 from digitalmobil/master
Dockerize!
2017-07-25 21:43:22 +02:00
Tuschl
1b37528e32 Adjust apache uid and gid
The alpine packages now use the username apache instead of www-data, so
we're adjusting to this.

Also, since we want to use this image with the stock php-apache images,
which uses uid and gid 33 (since it's debian based), we also adjust
things accordingly.

NOTE: At a later point this should be solved with a build or environment
      variable.
2017-07-25 21:09:42 +02:00
Tuschl
b27eb41a03 Move docker files to toplevel
DockerHub automated builds stubbornly refuse to see the files inside the
docker dir. Moving them top level to play nice :-/
2017-07-25 19:26:16 +02:00
Tuschl
95100a64dc Add section on docker to README 2017-07-25 19:19:04 +02:00
Tuschl
7d93a19bfb Dockerize! 2017-07-25 18:53:45 +02:00
Marco Dickert
0fd8afbef3 fixed wrong reference to forbiddenChars 2017-07-25 13:49:29 +02:00
Marco Dickert
8ed757769b added isFilenameAllowed function, fixed some bugs 2017-07-25 13:19:12 +02:00
Marco Dickert
a51d18d6d7 spread the isFilenameValid function 2017-07-25 13:19:12 +02:00
Marco Dickert
edd460b996 fixed broken check of zip files 2017-07-25 13:17:14 +02:00
Marco Dickert
2d42d3d65f Merge pull request #57 from misterunknown/issue-54
closes #54
2017-07-24 17:24:01 +02:00
Marco Dickert
8225c596df fix merge conflict 2017-07-24 17:22:45 +02:00
Marco Dickert
ab31ade042 fix missing encoding for initial chdir 2017-07-24 17:21:25 +02:00
Marco Dickert
0eab5b3777 fix missing encoding for initial chdir 2017-07-24 15:26:59 +02:00
Marco Dickert
191faa4678 fix correct encoding/decoding of folder urls in the browser history 2017-07-24 15:26:59 +02:00
Marco Dickert
e73067f223 new build after merging jrondorf/master (#55) 2017-07-24 15:03:11 +02:00