Commit Graph

2719 Commits

Author SHA1 Message Date
qtwrk
a205c5a3fe revert 2020-03-09 14:30:25 +01:00
Usman Nasir
514f031e1e Merge branch 'stable' into v1.9.5 2020-03-09 16:33:21 +05:00
Usman Nasir
a78a557d5a update MarkupSafe version 2020-03-09 16:31:48 +05:00
Usman Nasir
edfcf29d38 git manager: set/view repo remote 2020-03-09 16:30:56 +05:00
Usman Nasir
c4ca01cafb Merge pull request #283 from aonsyed/patch-1
Update MarkSafe version
2020-03-09 16:29:43 +05:00
Muttahir Aon Syed
6fd2e6697d Update MarkSafe version
Updated MarkSafe version to 0.19 to fix this issue https://forums.cyberpanel.net/discussion/4051/issue-with-python-markupsafe-module-on-install#latest
2020-03-09 16:23:33 +05:00
Usman Nasir
defe91c0f9 Merge branch 'stable' into v1.9.5 2020-03-09 09:04:06 +05:00
Usman Nasir
91af462271 bug fix: add path to git commands 2020-03-09 08:59:57 +05:00
Usman Nasir
22f7cf640f Merge pull request #282 from istiak101/stable
Fix title to Email Logs
2020-03-09 08:57:50 +05:00
qtwrk
e973cc26d1 fix MarkupSafe module issue 2020-03-09 03:18:31 +01:00
Istiak Ferdous
5e4a6a2910 Fix title to Email Logs 2020-03-09 06:33:43 +06:00
Usman Nasir
bf255dcb90 merge stable 2020-03-08 12:41:13 +05:00
Usman Nasir
127a3e455f Merge pull request #281 from usmannasir/qtwrkdev
sync to gitee
2020-03-08 12:39:39 +05:00
qtwrk
74978fa8f7 Merge branch 'stable' into qtwrkdev 2020-03-08 02:22:25 +01:00
qtwrk
de567726bb pip3.6 link 2020-03-08 00:07:29 +01:00
qtwrk
6e5a9072cb fix upgrade script 2020-03-07 23:38:38 +01:00
qtwrk
2d6eb564a0 minor fix on upgrade 2020-03-07 22:05:20 +01:00
qtwrk
92d101e6cc minor fix on upgrade 2020-03-07 22:03:45 +01:00
qtwrk
b9ce0b73a9 sync to gitee 2020-03-07 21:22:53 +01:00
Usman Nasir
0ad5a76221 fetch git branches 2020-03-07 23:25:58 +05:00
Usman Nasir
46e2005a41 resolve conflict 2020-03-07 21:05:52 +05:00
Usman Nasir
198bfa794d git manager initial 2020-03-07 21:03:17 +05:00
qtwrk
b7cf72188c test sync 2020-03-07 17:00:10 +01:00
qtwrk
6bd669fb70 test sync 2020-03-07 16:59:45 +01:00
qtwrk
c7ff1af004 test sync 2020-03-07 16:59:22 +01:00
qtwrk
d951720ab7 test syncing 2020-03-07 16:38:59 +01:00
qtwrk
6e0ab32ea1 test syncing 2020-03-07 16:38:21 +01:00
Usman Nasir
c947e8b0a7 Merge branch 'stable' into v1.9.5 2020-03-07 19:02:54 +05:00
Usman Nasir
2dc5ecd361 git manager initial 2020-03-07 19:01:54 +05:00
qtwrk
de0706edd1 test for syncing 2020-03-07 12:23:46 +01:00
qtwrk
0b08131cfc update some link 2020-03-06 17:36:04 +01:00
Usman Nasir
acdcfcb797 enable imunify status 2020-03-06 19:09:41 +05:00
Usman Nasir
3ea6f7197b complete imunify integration 2020-03-06 19:08:45 +05:00
Usman Nasir
9f642cab39 bug fix: file manager permissions 2020-03-06 12:10:05 +05:00
Usman Nasir
20a88b0dab bug fix: file manager permissions 2020-03-06 11:37:08 +05:00
Usman Nasir
1f1863f82f bug fix: website creation 2020-03-06 11:08:50 +05:00
Usman Nasir
5b263d6853 bug fix: increase size of external app 2020-03-06 09:25:49 +05:00
Usman Nasir
74070be0f6 change domain validation scheme 2020-03-06 00:25:11 +05:00
Usman Nasir
0e92dc741b add imunify page 2020-03-06 00:17:01 +05:00
Usman Nasir
aaed42e3cd Merge pull request #280 from Znuff/stable
Domain Validator
2020-03-06 00:15:25 +05:00
Znuff
8e07f7ea1a Proper domain validation with the "validators" library. 2020-03-05 21:02:38 +02:00
Usman Nasir
4aeadccc28 add root to linux admins for imunify 2020-03-05 23:54:49 +05:00
Znuff
413aef3336 Double square [[ brackets are a bash features.
`==` is undefined in POSIX sh
2020-03-05 20:49:05 +02:00
Usman Nasir
e6a817b992 bug fix: delete linux user upon website deletion 2020-03-05 15:20:22 +05:00
Usman Nasir
4dd909d111 Merge pull request #279 from alystair/patch-1
Delete .DS_Store
2020-03-05 08:40:33 +05:00
Lorin Halpert
62bb67e4d6 Delete .DS_Store
It is listed in .gitignore file - OSX metadata file unrelated to project, must have been left over from time prior commit or from a client that does not follow .gitignore rules
2020-03-04 16:35:12 -05:00
Usman Nasir
c9e11fd7b0 bug fix: some permissions during backup restore 2020-03-04 23:19:13 +05:00
Usman Nasir
1da562450c make website transfer compatible between v1.9.4 and v1.9.5 2020-03-04 22:58:29 +05:00
qtwrk
3c1ba8cbbc remove white space and unwanted string 2020-03-04 14:00:55 +01:00
Usman Nasir
9c40df8244 Merge branch 'stable' into v1.9.5 2020-03-04 17:46:45 +05:00