ISPConfig 3:6a25accffe0c2818e00dc3ad5dd3eb3a47c76291 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/6a25accffe0c2818e00dc3ad5dd3eb3a47c762912016-01-22T19:11:31+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6a25accffe0c2818e00dc3ad5dd3eb3a47c76291import previous work (not working completely yet)2016-01-22T19:11:31+01:00A. Täffnerdarkalex@firesplash.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/698ed15a80799a5f3942200b7ff257563123878eMerge branch 'stable-3.1'2016-01-22T11:00:47+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bdb3e8057e46d5e69bae3dffb4d2669090b0ee8f- fixed missing path in check2016-01-22T11:00:12+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ecf53783ba31fec41a11782c9bb46f2d3f99635f- reverted previous commit (partly)2016-01-22T10:59:31+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6844de8422ad2ffcd1f5c864ea967c8321ac07b7- don't delete .well-known dir if it existed prior to run2016-01-22T10:57:06+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/50b59af5b65ae0562fb9dfbc27332cc4fc91e437Merge branch 'stable-3.1'2016-01-21T12:05:46+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a20ec4ca718da1c2437948110d86faf53146ce5a- ported patches for letsencrypt2016-01-21T12:05:09+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/337473b29af23892d2bcbe4cc97c087aa5ff8b30Merge branch 'stable-3.1'2016-01-20T11:02:40+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6cc90d3444407a32d5a1f6ff29ebf8f01c0e760dMerge branch 'domain_specific_welcome_message' into 'stable-3.1'2016-01-20T11:02:21+01:00Marius Burkardm.burkard@pixcept.de
Allow domain specific welcom messages:
* In addition to language specific custom welcome messages (when creating a new mail account) this patch will
allow to have a welcome message template for each domain.
* To add a domain specific welcome message, place a file at /usr/local/ispconfig/server/conf-custom/mail/
and name it according the domain, like welcome_email_example.com.txt
* i.e. /usr/local/ispconfig/server/conf-custom/mail/welcome_email_example.com.txt
will be used if a mailbox for example.com is created.
See merge request !263https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ba59737e157c0e1ce23b2443f08733b9f9a38bfeMerge branch 'master' into 'stable-3.1'2016-01-20T11:01:28+01:00Marius Burkardm.burkard@pixcept.de
Master
See merge request !264https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ec64cf5c39c388c297607ba3ac1424f057eafaeeMerge branch 'stable-3.1'2016-01-20T10:59:46+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6332aca4c482615a2168b3afad3170954b9f36a6Merge branch 'darkalex/ispconfig3-mailsec-sendas' into stable-3.12016-01-20T10:58:24+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b9d4a730dba72ca82013d5fed1c787c6f72d69b5re-formatted2016-01-20T10:57:00+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8fc75dace32765ec39358c0f1957318a7c1f31a9Merge branch 'ftp_statistics' into 'stable-3.1'2016-01-20T10:54:33+01:00Marius Burkardm.burkard@pixcept.de
Ftp statistics feature
Hi,
I add the ftp traffic support for pure-ftpd.
- Ftp statistics display per hostname in site section (traffic in and out)
- Ftp_traffic table (creation and update patch upd_0081.sql)
- Cronjob
- Actually pure-ftpd log rotation are configured with /etc/logrotate.d/pure-ftpd-common
- Maybe replace that per Ispconfig log rotation ?
- Api function for ftp traffic
Thanks
See merge request !266https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7799762f2a7ac3835f5e1f238ef32143fdeb3455Mail Security: implemented a SendAs-Permission for aliases and forwardings (b...2016-01-20T10:13:09+01:00A. Täffnerdarkalex@firesplash.deNOTE: I did only translate de and en!https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ddfbbd8dbad65a439dfcd25b8fc4e23459c56b1cupdate sql file for ftp_stats2016-01-19T13:36:10-05:00LEVEILLE Cédricleveille.cedric@oricom.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5dd3d754422cd91cc0aa755f989e42c91786158dFtp statistics feature2016-01-18T14:07:02-05:00LEVEILLE Cédricleveille.cedric@oricom.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cfc79e73e49fdb1f3cc3e80238011c8c1b9dd7ddFtp statistics feature2016-01-18T13:49:38-05:00LEVEILLE Cédricleveille.cedric@oricom.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b6a0ab059e67975984633b1a99446818b3e9ee59Merge branch 'stable-3.1'2016-01-18T14:43:34+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c9b5ed4f09b73c7a9008ca9736ce4fd85a9ebdbc- allow letsencrypt call to challenge dir2016-01-18T14:42:51+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f0b03be2a39f1bc31fa3488bd457fadb878a32cdMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32016-01-16T10:43:38+01:00Florian Schaalflorian@schaal-24.de
Conflicts:
interface/web/client/form/reseller.tform.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bad4bd31db037d017692ec3b573dea60143f0dbdsome more filter_var for email2016-01-16T10:39:09+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a713050f095c7b94c29b8e7ccadd71bcab1af4eb- Merged some foreign fixes2016-01-15T16:50:32+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bb984cedaa3530ccc88c4c1f7ca84ebbfbc52d89Allow domain specific welcom messages:2016-01-15T14:06:37+01:00Daniel Steglichsteglich@datasystems24.de
* In addition to language specific custom welcome messages (when creating a new mail account) this patch will
allow to have a welcome message template for each domain.
* To add a domain specific welcome message, place a file at /usr/local/ispconfig/server/conf-custom/mail/
and name it according the domain, like welcome_email_example.com.txt
* i.e. /usr/local/ispconfig/server/conf-custom/mail/welcome_email_example.com.txt
will be used if a mailbox for example.com is created.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ee60c95a22aad82742bd9da439acd6ee8f0796afMerge branch 'master' into 'master'2016-01-12T15:08:44+01:00Marius Burkardm.burkard@pixcept.de
fixed db.quota stats
See merge request !262https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/07235f49fb4f447cce26abf35497984f4254e527fixed db.quota stats2016-01-12T11:37:40+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/14ff27bffc85e641ce4fe7738e86aaa3b73beb13Improved templates in client module.2016-01-10T21:17:58+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3e7d11a2282bb176fb4703e32ee7c2708d7c9566Improved form for Tools > User settings.2016-01-10T20:41:49+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cd21058d7ea0716a763aefc56c320fbffefa2457Improved Client and DNS slave form.2016-01-10T18:25:13+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2d45f0abce63945cb05ab7fcf7d0642e8107905eChanged behaviour of new ISINT filter to allow negative values (like the old ...2016-01-10T18:24:47+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6cae8295d614cfbc5d425d17ff40e3288b7a4b83Improved DNS SOA form.2016-01-10T18:06:26+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/394b0fffb72ba1c29e0b1688385ab2f9577ea5c0Fixed syntax error in DNS AAAA form definition.2016-01-10T18:06:04+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a076c24fd2a45f7a46bdf4415eb0c91a745965e5Improved several forms in mail module.2016-01-10T17:53:45+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/046563ec57bfcd642e83c92fd63013bff3ff46a6Fixed typo in xmpp_domain create statement in sql dev collection file.2016-01-10T17:41:37+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/96ae77f9f14f3e1381fa3e5405c693b0273ce1d2Implemented new date validation for autoresponder.2016-01-10T17:15:52+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7adc6ceeeace6088f0ff68454201897b3fd83991Added ISDATETIME validator in tform_base.inc.php.2016-01-10T17:15:13+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4b17d9e51efc670d3a02bf739d9e4d77be89a0e8Fixed aps instances and database quota list.2016-01-10T15:15:57+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2f311b74a1b84698aeae20d50c1189ebe0213990Adapted package installer UI to Bootstrap theme.2016-01-10T15:12:10+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8712e41963938517f2c431f467816feb915e9778Fixed tab menu in APS package details screen.2016-01-10T14:44:58+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ec42ad14f7a3984a4e882a6b0e1b7f32ea719cd0Updated cron form.2016-01-10T14:39:59+01:00Till Brehmtbrehm@ispconfig.org