ISPConfig 3:610315b8b6fd82e878d910e034304e1439461d60 commitshttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commits/610315b8b6fd82e878d910e034304e1439461d602015-01-22T07:43:01+01:00https://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/610315b8b6fd82e878d910e034304e1439461d60increase size for txt-records for the admin to change txt-records for dkim2015-01-22T07:43:01+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/6b199e233a22e849ba2986fdedce7cd24725ebeballow the admin to change txt-records for dkim, dmarc and spf directly2015-01-21T13:20:28+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/91a3943cdf76ac4d082318f38363d98762372fa8fixed sql-queries in mail_domain_edit.php2015-01-21T12:38:56+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/d84a2dcb1ac84283fc26df96401c8e21f5d39c62fixed sql-queries in dns_dmarc_edit.php2015-01-21T12:38:10+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/74df312505d81f22b3205409b682e41fa71a4838set ttl > 0 for dkim-records2015-01-21T12:37:16+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/f7580dde244b7180da4edf4dc6d97c1f9a0c964ffixed sql-query in dns_spf_edit.php and re-add spf-template2015-01-21T12:36:25+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/93fdfe3a3cdd3b385a6a9ef74e91c9616b01390bMerge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-01-21T10:13:28+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/82cf1e84254fc9023b4871ba40967cc4966c9452Merge branch 'renky/ispconfig3-master'2015-01-21T10:13:19+01:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/web/mail/templates/mail_user_backup_list.htmhttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/c0138f5488dc19898c9e6c2df6c6264ee618e77cMerge branch 'master' into 'master'2015-01-21T10:09:35+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !157https://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/f3f4aa5c5498c5af4b9248807d9720b13891b2abAdded en+ Device in bastille firewall config to improve Centos 7 support.2015-01-18T14:35:41+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/55c012f85a6768b2e6a918de3a4f8bba6fd8cc6efixed issue with delete mail-backups when removing a email-user / email-domain2015-01-16T16:05:35+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/a8c50cdf1783a4948e2008a94a2811699a39e20afixed database_quota_stats-page and add server-name (FS #3791)2015-01-15T16:45:02+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/355b48c4ce5f410404a1d61434efebdf858033a3Removed idn2ascii filter from mail pattern field in spamfilter_users form as...2015-01-15T09:43:38+01:00Till Brehmtbrehm@ispconfig.orgRemoved idn2ascii filter from mail pattern field in spamfilter_users form as the filter alters the pattern so that the wildcard pattern @. is not possible.
https://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/f42d9169cd94b234c13403b3bc635fffe04fb252correction because of php 5.32015-01-14T21:48:50+01:00Dominikinfo@profi-webdesign.comhttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/40a0bf0825eccc77d681b075679ab5f0ab86b2abfixed template 32015-01-14T20:33:27+01:00Dominikinfo@profi-webdesign.comhttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/66190e1134676f3addf703b0424761c21cad7c52Merge branch 'master' into 'master'2015-01-14T20:17:32+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !156https://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/6a83ad0c416ed248b5a3cdd2a3571df0538f97bbtemplate style - the second2015-01-14T20:11:27+01:00Dominikinfo@profi-webdesign.comhttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/2615e90b0708eb1a057e9b63cf2068942a5f79ecfixed template-style2015-01-14T20:08:41+01:00Dominikinfo@profi-webdesign.comfixed small bug in mail-backup-cronhttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/b3f01831e85a16e60b547e959f5be920ed32a898Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-01-14T12:57:47+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/b2334106d3979c4a565836c9db99e0a4b66d1e5cadd size to backup-stats2015-01-14T12:57:00+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/1a0665decbfd7e332b41ad66af241969e6af518ffixed template2015-01-14T11:30:51+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/9bde82f26b822f1ef59277796492f363c0f6288fMerge branch 'master' into 'master'2015-01-14T11:08:47+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/155" data-reference-type="merge_request" data-original="!155" data-link="false" data-link-reference="false" data-project="1" data-merge-request="196" data-project-path="ispconfig/ispconfig3" data-iid="155" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!155</a>https://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/02872aadb2db4f31d60eec167d0c56d669ea65f3converted file to new layout html2015-01-14T10:57:05+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/c554c4f383f992b3783749a8401cf367237b2a62Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-01-14T10:56:37+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/b82b9939965fade914914175a91bd8d44f56ac74- converted file to new layout html2015-01-14T10:48:01+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/e2776cf48bfef3ffe330dcd725256dfd519e7558Scroll to page top on content load2015-01-14T10:28:37+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/67ef2d60f3afceed0dc834ef0252f71cb083c21b- fixed javascript position in file (template vars)2015-01-13T18:30:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/06339e0c8ac8fdbbf5d2784df8019704da9bd6eb- fixed javascript call in json file2015-01-13T18:28:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/1b48cf93582ebfcf43aa42e7c175900d21154b77- fixed javascript for new ISPConfig object2015-01-13T18:18:54+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/d76e2d6ef63cd2b3b7cdef5ef5052adc4fc32f77- re-added table sorting2015-01-13T18:07:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/bbb85a4e2d6e557c14735ffef748a7c5e9033cef- fixed js reference2015-01-13T17:13:14+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/2778c9ea730cee72dccbaf14e08b12c1bf8257db- cleaned up javascript2015-01-13T16:51:04+01:00Marius Cramerm.cramer@pixcept.de- removed most static content from scrigohttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/9021d7fc7ee308c0df84ad29da0bf316f592ce89- cleaned up javascript2015-01-13T16:48:15+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/cc2d7b297c8b8755c4cdf5ea2a13c390f51c23d1fixed fr_resync.lng2015-01-13T16:39:10+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/746e5bbaea6f577e1fa623ee60481e2a918a041fadd backup stats for mail2015-01-13T16:37:12+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/2d0ebade46d8a5942adb3e2ce816840a6ae16c1e- Fixed column sorting2015-01-13T15:36:31+01:00Marius Cramerm.cramer@pixcept.de- cleaned up some javascripthttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/c193ade1fb594b8ef1981274666cf657f82d0c77Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-01-13T12:52:56+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/385f5459a9331f2dfe753cc64431dc3fc9ddc561- added utf8 conversion to db escape function2015-01-13T12:52:32+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/01e0759fa0c84fa61fa94ab4ef71e835e6d9ee04Merge branch 'master' of http://git.ispconfig.org/renky/ispconfig32015-01-11T20:02:27+01:00Dominikinfo@profi-webdesign.nethttps://git.ispconfig.org/lepirlouit/ispconfig3/-/commit/f8fda452daa1d57346d5d1942e21260581e8560bused new mount-backup-functions again2015-01-11T19:58:25+01:00Dominikinfo@profi-webdesign.net