Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update stable
hg pull -r default https://bitbucket.org/Noelfhim/no_ftp
hg merge f8bba3b0fc16
hg commit -m 'Merged in Noelfhim/no_ftp/default (pull request #10)'
I upload files using ssh to my server and I don't want to setup a FTP server only for oxwall (I don't use any suPHP or custom settings but files are all owned by www-data).
I know that some people had trouble with FTP need because when I first installed oxwall, I searched install forum to find a solution.
More explanations here: http://www.oxwall.org/forum/topic/19528
need new translations: - admin+site_use_ftp (Use FTP) - admin+site_use_ftp_desc (Uncheck this box if you don't want to use FTP for upgrade)
had to insert a line in base_config table: INSERT INTO ow_base_config (key, name, value, description) VALUES ("base", "use_ftp", NULL, "Uncheck this box if you don't want to use FTP for upgrade");
I had a discution with someone from the team that said that this way may need some changes for security reason. I'm OK if you explain me what is the problem because that person did not.