[Svn] [roundcube/roundcubemail] 461a30: Merge config files (#1487311).

GitHub noreply at github.com
Wed Jul 10 22:53:18 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/roundcube/roundcubemail
  Commit: 461a30d771edd8bc6606f2c92dfde363514b93b1
      https://github.com/roundcube/roundcubemail/commit/461a30d771edd8bc6606f2c92dfde363514b93b1
  Author: Aleksander Machniak <alec at alec.pl>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M INSTALL
    M UPGRADING
    M bin/installto.sh
    M bin/update.sh
    R config/db.inc.php.dist
    R config/main.inc.php.dist
    M installer/config.php
    M installer/index.php
    M installer/rcube_install.php
    M installer/test.php
    M plugins/additional_message_headers/additional_message_headers.php
    M plugins/debug_logger/debug_logger.php
    M plugins/password/README
    M plugins/show_additional_headers/show_additional_headers.php
    M plugins/subscriptions_option/subscriptions_option.php
    M plugins/virtuser_file/virtuser_file.php
    M plugins/virtuser_query/virtuser_query.php
    M program/lib/Roundcube/rcube_config.php

  Log Message:
  -----------
  Merge config files (#1487311).
Now we have defaults.inc.php and config.inc.php.
Renamed $rcmail_config to $config. Old naming and old files are supported
for backward compatibility.


  Commit: acc005301f28b92dc922d629c4a616931cc9f69b
      https://github.com/roundcube/roundcubemail/commit/acc005301f28b92dc922d629c4a616931cc9f69b
  Author: Aleksander Machniak <alec at alec.pl>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    A config/defaults.inc.php

  Log Message:
  -----------
  Add defaults.inc.php file (missed in last commmit because of .gitignore)


  Commit: d6707475ccf0462849309ac1ab902d37b72c4ff9
      https://github.com/roundcube/roundcubemail/commit/d6707475ccf0462849309ac1ab902d37b72c4ff9
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M installer/rcube_install.php

  Log Message:
  -----------
  Flag config as 'legacy'; remove config file switch


  Commit: 0f39b4f4cdd60f4af5f85d656ed08698e86287ea
      https://github.com/roundcube/roundcubemail/commit/0f39b4f4cdd60f4af5f85d656ed08698e86287ea
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M program/lib/Roundcube/rcube_config.php

  Log Message:
  -----------
  Enable legacy mode: allow running with old config files and log warnings every no and then


  Commit: 9bacb2cd3f7e8f96a29f651460954965c400aac6
      https://github.com/roundcube/roundcubemail/commit/9bacb2cd3f7e8f96a29f651460954965c400aac6
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M INSTALL
    M bin/update.sh
    A config/config.inc.php.sample
    M config/defaults.inc.php
    M installer/config.php
    M installer/index.php
    M installer/rcube_install.php

  Log Message:
  -----------
  Prepare config migration:
- Show warning in installer and hints how to migrate
- Let update.sh create the new config file if legacy config is detected
- Provide a sample config file for manual configuration
- Define a list of options which always should be written to local config


  Commit: 47278835f5173a65b797643e2a90edfcb55a1c5f
      https://github.com/roundcube/roundcubemail/commit/47278835f5173a65b797643e2a90edfcb55a1c5f
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M installer/rcube_install.php

  Log Message:
  -----------
  Preserve comments and order from existing or default config files


  Commit: 447fc6a657c6dc588510750617068bdd47209569
      https://github.com/roundcube/roundcubemail/commit/447fc6a657c6dc588510750617068bdd47209569
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M bin/update.sh
    M config/config.inc.php.sample

  Log Message:
  -----------
  Improve update.sh script; fix bad wording


  Commit: dee0aff85a7f2e5b16cf77835ac56a5ef2e4f1b7
      https://github.com/roundcube/roundcubemail/commit/dee0aff85a7f2e5b16cf77835ac56a5ef2e4f1b7
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M installer/index.php

  Log Message:
  -----------
  Avoid fatal errors if session support is missing; This shall be displayed in the first step


  Commit: 0703bfecd0b9efca36caee4f7b9c64c4135d57af
      https://github.com/roundcube/roundcubemail/commit/0703bfecd0b9efca36caee4f7b9c64c4135d57af
  Author: Thomas Bruederli <thomas at roundcube.net>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M INSTALL
    M UPGRADING
    M bin/installto.sh
    M bin/update.sh
    A config/config.inc.php.sample
    R config/db.inc.php.dist
    A config/defaults.inc.php
    R config/main.inc.php.dist
    M installer/config.php
    M installer/index.php
    M installer/rcube_install.php
    M installer/test.php
    M plugins/additional_message_headers/additional_message_headers.php
    M plugins/debug_logger/debug_logger.php
    M plugins/password/README
    M plugins/show_additional_headers/show_additional_headers.php
    M plugins/subscriptions_option/subscriptions_option.php
    M plugins/virtuser_file/virtuser_file.php
    M plugins/virtuser_query/virtuser_query.php
    M program/lib/Roundcube/rcube_config.php

  Log Message:
  -----------
  Merged configuration refactoring from 'dev_config' branch back into master (#1487311)


Compare: https://github.com/roundcube/roundcubemail/compare/bd2846930271...0703bfecd0b9


More information about the svn mailing list