ISPConfig 3:a56c8ab19906ec99b9128446af949d39e2872e46 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/a56c8ab19906ec99b9128446af949d39e2872e462015-12-13T15:45:24+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a56c8ab19906ec99b9128446af949d39e2872e46allow ipv6 wildcard for client web-domain2015-12-13T15:45:24+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d240f6d285ea4696b087763d99089591cb02fcfdMerge branch 'master' into 'master'2015-12-13T14:08:42+01:00Marius Burkardm.burkard@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/252" data-reference-type="merge_request" data-original="!252" data-link="false" data-link-reference="false" data-project="1" data-merge-request="296" data-project-path="ispconfig/ispconfig3" data-iid="252" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!252</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/54161b34b98a1d3ed8785f2f6850d0e712078be4allow re-assign additional php-version to ALL2015-12-13T12:26:30+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bb441dc8b4e78169a8cee7397f8041614b35bf97upd_dev_collection.sql2015-12-13T12:26:16+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bdd7348bc339889d7a8878b4b3bad55f43e4f945- fixed language entries for letsencrypt2015-12-08T17:31:37+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/394f3e17244fa6ec1e59a15d1a7081edbb8bc947- added missing language entry2015-12-08T17:09:26+01:00Marius Cramerm.cramer@pixcept.de- fixed letsencrypt domain listhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/46230badbe21f7c4337fef7369defd6f2372a5cf- wildcard domains not supported by letsencrypt, yet2015-12-08T17:04:23+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a7b97c4310d88cb7a7b736e465d07ad4526f609e- Fixed letsencrypt call2015-12-08T16:58:01+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a0dd76c1810ac74c23cd0889dd74eb8bbff8ac13- added missing letsencrypt template part2015-12-08T16:53:20+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/873244e795356d77426cbff4224f7b8a55a6835f- added letsencrypt arguments to exec call to avoid need of ini file2015-12-08T16:42:51+01:00Marius Cramerm.cramer@pixcept.de- added cron for letsencrypt renewalhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/435ce38d6939087144c7b8d2764968312e839e24- Added some code for the letsencrypt merge2015-12-08T16:24:06+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/10e9f75e0948d9dd72a4431c67292a05d582483cMerge branch 'master' into 'master'2015-12-08T16:15:30+01:00Marius Burkardm.burkard@pixcept.de
fixed error in mail_backup -> all mail-backups would have been deleted with old …
…code because of * in filename
See merge request !247https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2dffea3c8168906d0f6b0d8856faa85bb213c424Merge branch 'stable-3.0.5'2015-12-08T16:11:58+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/018c55dd71b17a2db9dc2d5cd21cb44a4963dda5- Merged https://github.com/alexalouit/ISPConfig-letsencrypt.git2015-12-08T16:09:46+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8fe08ad40be44c8497f4eff2739a990094d079afMerge branch 'stable-3.0.5'2015-12-04T16:41:46+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1fbf0d38c82aaa4fe20ef7a7158cdcbac81e16eeUpdated Czech language files.2015-12-03T08:59:10+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e6ded3ab52b8b823660181db85be511b2ef1ffe5Merge branch 'master' into 'master'2015-11-30T08:42:30+01:00Marius Burkardm.burkard@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/249" data-reference-type="merge_request" data-original="!249" data-link="false" data-link-reference="false" data-project="1" data-merge-request="293" data-project-path="ispconfig/ispconfig3" data-iid="249" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!249</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5e205c44672dd58c0d2ffd28885ba75b850c10c3FS#3837 - Adaptec-RAID in ISPConfig-Monitor (code) (wemaflo)2015-11-29T12:04:40+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d7f1c84e3e72ee77893fe08efac070b36df0ff76FS#3885 - LSI MegaRaid monitoring (code) (cwispy)2015-11-29T11:59:00+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/248d0eebf3d5d6eb2836c81b44795f5b71c4db9bFS#3806 - HP Proliant / SmartArray RAID-Status incl. Code (PatrickR)2015-11-29T11:48:37+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/add7cc461c0729819c73b2bf44076037a1592517Merge branch 'master' into 'master'2015-11-26T16:40:14+01:00Marius Burkardm.burkard@pixcept.de
add XMPP fields in client template database table
See merge request !248https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d88249237b563a89cf5bb2d037aad19f94d1e321add XMPP fields in client template database table2015-11-26T14:44:52+01:00Jan-Claas Dirksjcd@jcd.cchttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2bc9e1279176d05a78349dc0e6bff83ba4719faefixed error in mail_backup -> all mail-backups would have been deleted with...2015-11-21T15:32:25+01:00rootroot@angantyr.pwhost.defixed error in mail_backup -> all mail-backups would have been deleted with old code because of * in filename
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8938c852f00cbd4aa62772a2bafd528c71180772Merge branch 'master' into 'master'2015-11-20T08:23:15+01:00Marius Cramerm.cramer@pixcept.de
Master
Added possibility to delete backups manually
See merge request !246https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/aa365c418c88ad97ed0e9f0ffa4405fcda717715fixed sql-syntax2015-11-19T23:17:13+01:00rootroot@angantyr.pwhost.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/634132a0d83a3c83a3927e2aa943c035030d6b80Added possibility to delete backups2015-11-19T23:12:54+01:00Dominikinfo@profi-webdesign.com
Conflicts:
interface/lib/classes/remoting.inc.php
interface/web/mail/templates/mail_user_backup_list.htm
interface/web/sites/lib/lang/en_web_backup_list.lng
interface/web/sites/lib/lang/es_web_backup_list.lng
interface/web/sites/lib/lang/tr_web_backup_list.lng
server/plugins-available/backup_plugin.inc.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a5714c39c76695af5b2220e93a4ac3121a9d83a1Merge branch 'stable-3.0.5'2015-11-17T18:59:40+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c8509bf2e438adcf80591a6bc072359d6d44ed97- allow partly configured autoinstall.ini2015-11-17T17:24:09+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/fe9b73c387c396036a272daa39a809ed02980563Merge branch 'master' into 'master'2015-11-17T14:27:31+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !244https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f562971dee9f298e1b8566cb8196b7db4b792ec2typo2015-11-17T13:15:40+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ef5c451dabfe07d04b9fecc701f968725e5c9c95fixed remove inactive mail-backups2015-11-17T13:12:49+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/26e265ea89d14ef20430d171001efdbb7a591826- Added missing version change2015-11-16T10:09:58+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e0e69db9d9005fa2d98d0f3c88ef781c45cc0da2Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-11-15T14:44:20+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bc09783c350c49a1b85212a16a89d285da647781- Fixed mysql library (server version)2015-11-15T14:44:01+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0e3df6c91773d06145b8d37e3d9d79a3ffa8be99- Changed APS to 1.22015-11-15T14:42:39+01:00Marius Cramerm.cramer@pixcept.de- Fixed error in mysql libraryhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6659cd9406ff94a31aa03f499d9a013c1fe3ddacAdded accordion style collapsible on reseller limits form.2015-11-15T14:01:55+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4e82213778a773bf03ce38ab73dd3b37ef1557d5Removed todo strings from tabbed_form.tpl.htm.2015-11-15T14:00:51+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f4f981d8f98e4f74a8d69d05a31ab63e188ea808Added missing delimiter settings in reseller form file.2015-11-15T14:00:17+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0c1bc352c2f2984b19e43cc5e6182976a155fc0cMerge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-11-15T13:24:18+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c52fa27a2c744f008cd30e46fa00aa14d1b75b87Added accordion style collapsible on client limits form.2015-11-15T13:23:55+01:00Till Brehmtbrehm@ispconfig.org