Commit graph

3349 commits

Author SHA1 Message Date
Serghey Rodin
381da55889 forgot to add ^ 2016-12-08 16:48:28 +02:00
Serghey Rodin
039a989fb2 fix for aditional ftp accounts 2016-12-08 16:20:48 +02:00
Serghey Rodin
55a1bdefcb Workaround for OpenVZ/Virtuozzo 2016-12-08 15:41:04 +02:00
Serghey Rodin
bf699d7140 fix for memory chart 2016-12-08 14:30:10 +02:00
Yaroslav Snisar
f0dcb2bf0d Laravel template
It is a laravel nginx template for app based on Laravel framework.
Nginx conf from: https://laravel.com/docs/5.1/installation
2016-12-08 12:51:08 +02:00
naumov-socolov
56c4deb2b6 Merge pull request #980 from Estilate/master
Fixed issue #975 + Added missing spanish translations and fixed some spelling mistakes
2016-12-07 11:23:39 +03:00
Manuel Valle
a77b48760c Fixed 2 mistakes 2016-12-06 21:29:47 -03:00
Manuel Valle
41042e9973 Fixed spelling mistakes, added missing translations
I've read the full translation again and fixed a lot of spelling mistakes. I've also added new translations and I've made sure everything is named just in 1 way, I made rid of the sinonymous so everything is more understandable.
2016-12-06 21:22:15 -03:00
Manuel Valle
1adb0b54fb Fixed the key listing
Variable $key was returning the content from the file certificate.crt instead of certificate.key
2016-12-06 16:42:10 -03:00
Flat
6ce840fd28 Merge pull request #973 from myrevery/patch-1
Update cn.php
2016-12-05 03:10:42 +09:00
myrevery
6c55a19e66 Update cn.php
Add some translation and refine some details.
2016-12-02 14:50:06 -08:00
Michal Slepko
3fa2133a46 Added additional domain parameter formatting when adding SSL for domain 2016-12-02 21:06:08 +00:00
Dmitry Naumov-Socolov
c07c4f8505 WEB. File Manager, positioning hotkeys popup at the middle of the screen 2016-12-02 09:33:55 -05:00
Michal Slepko
fea7e8471e Added missing Polish translations 2016-12-01 22:25:12 +00:00
Secretjail
fcc841b1a3 Update fa.php 2016-11-29 22:23:51 +03:30
Dmitry Naumov-Socolov
a0cc554c97 Merge branch 'master' of github.com:serghey-rodin/vesta 2016-11-29 05:14:01 -05:00
Dmitry Naumov-Socolov
0f774a28ec Merge branch 'ja2015-ja2015' 2016-11-29 05:13:25 -05:00
Dmitry Naumov-Socolov
9550550555 Merge branch 'ja2015' of https://github.com/ja2015/vesta 2016-11-29 05:12:28 -05:00
Flat
181ab38d46 Merge pull request #964 from nguyenngocphuongnb/master
Update Vietnamese language package
2016-11-29 18:49:45 +09:00
Ngoc Phuong
ef5727299c Update Vietnamese language package 2016-11-29 16:38:30 +07:00
Flat
32015dea41 Merge pull request #962 from Flatta/master
Language file update
2016-11-29 16:47:46 +09:00
Flat
69959f25b0 Update i18n/bg.php 2016-11-29 16:42:00 +09:00
Flat
dfea3e5e8d Merge branch 'master' of https://github.com/serghey-rodin/vesta
# Conflicts:
#	web/inc/i18n/fa.php
2016-11-29 16:29:59 +09:00
Anton Reutov
d2052533a4 Bulgarian language 2016-11-29 00:30:38 +03:00
Dmitry Naumov-Socolov
6817a96953 Merge branch 'ja2015' of https://github.com/ja2015/vesta into ja2015-ja2015 2016-11-28 16:12:48 -05:00
Anton Reutov
ecc2486551 Merge pull request #963 from Secretjail/patch-3
Update fa.php
2016-11-29 00:07:30 +03:00
Secretjail
899c1531c6 Update fa.php 2016-11-29 00:21:09 +03:30
Serghey Rodin
76d518bf86 dynamic name for php-fpm service 2016-11-28 15:45:45 +02:00
Flat
46302f6fe1 Update language files (i18n/*.php).
- Add missing key
  - 'Your certificate will be ...' (en.php)
  - 'no notifications'
  - 'configure'

- Fix several typos

- Sort keys

- Remove certain comments
2016-11-28 22:30:59 +09:00
Flat
f427c196f1 Use array() instead of [] 2016-11-28 21:03:17 +09:00
JA
5939012ab1 Change Menus and checkboxes disabled to hide 2016-11-28 10:15:04 +09:00
Dmitry Naumov-Socolov
741d44754d WEB. fixed #960 shortcuts layer positioning 2016-11-27 08:37:54 -05:00
Flat
5db4a6dd3b Merge branch 'master' of https://github.com/serghey-rodin/vesta 2016-11-27 14:20:36 +09:00
Flat
155791241f Make not to translate FTP username 2016-11-27 14:18:23 +09:00
dpeca
0a97b522a1 Merge pull request #961 from Secretjail/patch-2
Update fa.php
2016-11-27 00:43:44 +01:00
Secretjail
e2e45820c9 Update fa.php 2016-11-27 02:28:16 +03:30
Secretjail
021c4c5efe Update fa.php
update new text.
2016-11-27 01:48:31 +03:30
Flat
a41f594fb5 Update header.html 2016-11-27 00:12:12 +09:00
Flat
4134d83769 Update Japanese translation 2016-11-26 23:15:17 +09:00
Serghey Rodin
5003c5b819 fix for php-fpm on ubuntu 16.04 2016-11-25 21:26:26 +02:00
Serghey Rodin
65eb4c7fe8 fix mysql init for ubuntu 16.04 2016-11-25 21:03:26 +02:00
JA
d120654a9b I deleted extra spaces. 2016-11-26 03:44:29 +09:00
JA
efcde95a90 Disable checkboxes 'DNS Support', 'Mail Support' if they are set '0' in the package. 2016-11-26 02:55:53 +09:00
JA
cc15e4adad Disable WebUI header menu WEB, DNS, MAIL, DB, CRON, BACKUP if they are set "0" in the package. 2016-11-26 02:42:33 +09:00
Serghey Rodin
1820107da2 workaround for old ubuntu 2016-11-25 17:16:59 +02:00
Serghey Rodin
b262f81555 list only tpl files 2016-11-25 12:29:41 +02:00
Serghey Rodin
d93a769b9d nginx config update 2016-11-25 12:19:04 +02:00
Serghey Rodin
08247f2ce2 new dns templates 2016-11-25 12:09:33 +02:00
Serghey Rodin
29a0226120 Merge pull request #945 from ioannidesalex/patch-23
Fix php-fpm template
2016-11-25 12:44:42 +03:00
Dmitry Naumov-Socolov
f742c99641 WEB. additions to fix #915 2016-11-24 17:00:34 -05:00