ISPConfig 3:746e5bbaea6f577e1fa623ee60481e2a918a041f commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/746e5bbaea6f577e1fa623ee60481e2a918a041f2015-01-13T16:37:12+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/746e5bbaea6f577e1fa623ee60481e2a918a041fadd backup stats for mail2015-01-13T16:37:12+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c193ade1fb594b8ef1981274666cf657f82d0c77Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-01-13T12:52:56+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/385f5459a9331f2dfe753cc64431dc3fc9ddc561- added utf8 conversion to db escape function2015-01-13T12:52:32+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0d5e54e5a149a24f8cc04989be2e7611d98852a4Merge branch 'master' into 'master'2015-01-10T15:49:21+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/152" data-reference-type="merge_request" data-original="!152" data-link="false" data-link-reference="false" data-project="1" data-merge-request="192" data-project-path="ispconfig/ispconfig3" data-iid="152" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!152</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bb5ccb0028569fadceea2240d85a9aaf901ea588moved inc-sql-updates to upd_dev_collection.sql2015-01-10T15:36:22+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e422602ac6b68c09005d404564375ccc1f3e2251fixed regex for include: in spf-wizard2015-01-09T17:40:00+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/892bd91b2ee9022836b16ac2b0e3fba07d50a188re-add dkim & spf button to the dns2015-01-09T17:38:46+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5d93b3a4ecc8931eb8c2fcf619eb34c30068bcccadd missing sql-column mail_user.sender_cc to inc-updates2015-01-09T17:34:21+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6cf50dc7cf34cc38832d5a7e55a28390aa9b13a0Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-01-09T17:31:13+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bfae4c80dd704ba11148d42e90105b38d45211fb- Cleaned up code in plugin_backuplist.inc.php.2015-01-09T17:21:26+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d5b5d3d8fc4ce9380653d6ff60ae8b678e858433Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-01-09T17:15:03+01:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/lib/classes/plugin_backuplist.inc.php
interface/web/sites/templates/web_backup_list.htmhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f757771128c7c9414a35ac2743ff123934a8b211- Made sure SQL backups from servers that differ from the server where the...2015-01-09T16:39:04+01:00Falko Timmeft@falkotimme.com- Made sure SQL backups from servers that differ from the server where the website is on can be restored. A download of the backup is not possible in such a case, therefore I hide the "Download" button.
Conflicts:
interface/lib/classes/plugin_backuplist.inc.php
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6547f463a75278cfb83d5ee860e8f53b931ee84dremove db-name from inc-sql2015-01-08T20:50:58+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/513a1785121fe98ced58bb0713885926a1ee42a9Merge branch 'master' into 'master'2015-01-08T20:08:16+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/150" data-reference-type="merge_request" data-original="!150" data-link="false" data-link-reference="false" data-project="1" data-merge-request="190" data-project-path="ispconfig/ispconfig3" data-iid="150" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!150</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0e72ef1fd668741f348fa71382dca32cd03dd0c3fixed sql-queries2015-01-08T20:01:12+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2e9ac915cb0efc7474443d317e317d9875a1feefMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-01-08T18:18:40+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c4c549eff3d39d4a1bfc83e138b47110bd51cb55Missed one location in prev commit2015-01-08T17:18:01+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d4acde6433ffda2c8a211d892991e96302b222ffMerge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-01-08T17:15:30+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/020db1e97ce30302717529303f062f9da26488aa- temporary fix for non-working collapsed sections2015-01-08T17:15:10+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/65640b02b14a1743bba87b0c2752dfc6e1f76c21- Mulitserver setup: list backups from remote servers in backup list.2015-01-08T16:40:39+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/15b651f3d101df47a631a93626034e2c3b9954ef- added needed dashboard cols for billing2015-01-08T16:07:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3b0546fc2539df441819dbf05d679d349c62267aMerge branch 'pixcept/ispconfig3-mods-new-layout-3.1'2015-01-08T15:35:43+01:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/web/admin/templates/directive_snippets_list.htm
interface/web/sites/templates/web_vhost_domain_ssl.htmhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/89e4329a8068e3631d3f64f6896fa3907c687cf5Layout fix: tab toggle and monitor tables2015-01-08T15:08:50+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5d742c79d09c004ff772df5afb5c4cc262614a67Layout fix: column width2015-01-08T13:20:07+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/718ea6b80ba715b67213a37b5e6ea85d24a29485Layout fix: wrong dom elements2015-01-08T13:06:40+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3647964bad957afe43ff10d95ae61188d81db19dLayout fixes (legend)2015-01-08T12:43:37+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/72f804db02de804be7a1082493aa5233b10dce2bLayout fixes: field sizes2015-01-08T12:15:36+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3fd01f4f60b54a46d358d59866dbd5256db8ef63Layout fix username prefixes2015-01-08T12:01:37+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5c7919f4af2ca54d3766ffbf333a3b6cadee5305Layout improvement (flags and javascript)2015-01-08T11:56:43+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e645fa3551f547817e7589c9e6da68c1139ce556Layout improvement - select boxes with flags2015-01-08T11:24:07+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f36346d45a8f1bc90fe852df78547795c6f8f64f- Layout fixes (column width and alignment)2015-01-08T10:41:05+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/680c56f95b14b1b33e0218f1eb62a58f9f491483Layout improvements (column width)2015-01-08T10:11:57+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dec3e3d5ba2ef9a68e574b1e42416a8bd9936e67- Layout fixes2015-01-08T09:58:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/33712949277582a826eee5b6eeb95636caebd8a3- Responsive menu improved2015-01-07T16:07:02+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b6b07d377192665e00b0f016bdc56d8d5d33b92e- Layout fixes2015-01-07T15:52:38+01:00Marius Cramerm.cramer@pixcept.de- Responsive fixeshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8173c6f28d9fd55fa249d76330bf7709923c4fcd- Added option to fill fields on SSL tab with client data by clicking on a link.2015-01-07T14:40:35+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8ceb0824027750b720f7788e44ed0deb87be6f08- Layout fixes2015-01-07T13:52:03+01:00Marius Cramerm.cramer@pixcept.de- Included new icons and buttons
- Layout scaling improved (up to 1260px width)https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ba731655369b9b5dd5d8514a4256905c7640f0aeLayout fixes2015-01-07T11:03:09+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6ab3c5d3ce307699ce3ef27b87ee6582c96be55d- Layout fixes2015-01-07T10:01:21+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dcb1f40c0b4059ca191756b38eb153e5693b4c2cMerge branch 'merge/directive_snippets-add_selection' into 'master'2015-01-06T18:32:52+01:00Falko Timmeft@falkotimme.com
Merge/directive snippets add selection
See merge request !148