Merge branch 'release/2.0.2'

.gitignore

@@ -0,0 +1,18 @@
+build.sh
+build.default.properties
+build.xml
+.DS_Store
+*.cache.properties
+*~
+*.swp
+build.properties
+.buildpath
+.project
+.settings
+.settings/**/*
+.externalToolBuilders
+.externalToolBuilders/**/*
+.vagrant
+.vagrant/**/*
+Vagrantfile
+/.idea

.travis.yml

@@ -0,0 +1,17 @@
+language: php
+php:
+  - 5.3
+before_install:
+  - mkdir test/
+  - curl -sS https://getcomposer.org/installer | php
+  - chmod +x ./composer.phar
+  - ./composer.phar --version
+  - ./composer.phar install --dev
+before_script:
+  - CURR_DIR=$(pwd)
+  - bin/mage-ci install test 1.7.0.2 magento_test -c -t -r http://mage-ci.ecomdev.org
+  - bin/mage-ci install-module test $CURR_DIR
+  - git clone https://github.com/EcomDev/EcomDev_PHPUnit.git ./phpunit/
+  - bin/mage-ci install-module $CURR_DIR/test $CURR_DIR/phpunit/
+script:
+  - bin/mage-ci phpunit test

README.markdown

@@ -0,0 +1,75 @@
+FireGento_MageSetup
+=====================
+MageSetup configures a shop for a national market. It's the international variant and successor of [GermanSetup](https://github.com/firegento/firegento-germansetup).
+
+Currently supported countries: Austria, France, Germany, Italy, Russia, Switzerland, United Kingdom. More to follow.
+
+Build Status
+------------
+* Latest Release: [![Master Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=master)](https://travis-ci.org/firegento/firegento-magesetup)
+* Development Branch: [![Development Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=development)](https://travis-ci.org/firegento/firegento-magesetup)
+
+Facts
+------
+- Version: check [config.xml](https://github.com/firegento/firegento-magesetup/blob/master/src/app/code/community/FireGento/MageSetup/etc/config.xml)
+- Extension key: FireGento_MageSetup
+- [Extension on GitHub](https://github.com/firegento/firegento-magesetup/)
+
+Description
+------------
+Central features of MageSetup are:
+
+* Setting of important configuration settings
+* Predefined tax settings and tax classes for shipping from several countries to worldwide destinations
+* Assign new tax classes to all products (configurable)
+* Creation of email templates based on the local language pack. Legal texts can be added to some templates automatically.
+* Creation and Activation of Checkout Agreements. Agreements can be shown at customer registration instead of or additional to the checkout. They can be required or not.
+* Creation of default CMS pages like imprint, terms and conditions, privacy, shipping, payment methods.
+* Create email templates, cms pages and blocks as well as checkout agreements for store views with a different language as well
+* Possibility to add tax and/or shipping info to all prices
+* Automatical generation of meta data to products
+* Saving of every status change of newsletter subscriptions
+* Presets are configurable via xml files for every country seperately
+
+Requirements
+------------
+- PHP >= 5.3.0
+
+Compatibility
+--------------
+- Magento >= 1.6
+
+Installation
+-----------------------
+Please create the desired websites and store view as well as install any language packs before running MageSetup.
+
+Copy all files from the src/ folder to your magento directory in order to install the MageSetup module.
+After you have installed the module, you should clear the cache and log off from admin panel. When you log on again, you should see the following hint:
+
+    MageSetup has been installed. Click here to set up your pages, blocks, emails and tax settings.
+
+If you don't see that hint, please check that the configuration setting **System -> Configuration -> Developer -> Template Settings -> Allow Symlinks** is enabled.
+
+On the linked page, you can make the desired settings and then click "Run MageSetup" on the top or bottom right. The adjustments will be made.
+
+Support
+-------
+If you encounter any problems or bugs, please create an issue on [GitHub](https://github.com/firegento/firegento-magesetup/issues).
+
+Contribution
+------------
+Any contribution to the development of MageSetup is highly welcome. The best possibility to provide any code is to open a [pull request on GitHub](https://help.github.com/articles/using-pull-requests).
+
+Developer
+---------
+FireGento Team
+* Website: [http://firegento.com](http://firegento.com)
+* Twitter: [@firegento](https://twitter.com/firegento)
+
+Licence
+-------
+[GNU General Public License, version 3 (GPLv3)](http://opensource.org/licenses/gpl-3.0)
+
+Copyright
+---------
+(c) 2011-2013 FireGento Team

composer.json

@@ -0,0 +1,25 @@
+{
+  "name": "firegento/magesetup",
+  "license": ["GPL-3.0"],
+  "type": "magento-module",
+  "description": "MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
+  "homepage": "https://github.com/firegento/firegento-magesetup",
+  "require": {
+    "magento-hackathon/magento-composer-installer": "*"
+  },
+  "require-dev": {
+    "ecomdev/mage-ci": "master-dev"
+  },
+  "config": {
+    "bin-dir": "bin"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "http://packages.firegento.com"
+    }
+  ],
+  "extra":{
+    "magento-root-dir": "test/"
+  }
+}

docs/api/html/classes/FireGento_MageSetup_Adminhtml_NewsletterController.xhtml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "html" "">
+<html xmlns="http://www.w3.org/1999/xhtml" class="no-js" lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <title>FireGento_MageSetup - FireGento_MageSetup_Adminhtml_NewsletterController - API Documentation</title>
+    <link href="../css/normalize.css" rel="stylesheet" type="text/css" media="all"/>
+    <link href="../css/styles.css" rel="stylesheet" type="text/css" media="all"/>
+  </head>
+  <body>
+    <div class="wrapper clearfix">
+      <div class="topbar clearfix">
+        <h1>
+          <a class="brand" href="../index.xhtml">FireGento_MageSetup - API Documentation</a>
+        </h1>
+        <ul class="nav">
+          <li class="active">
+            <a href="../index.xhtml">Overview</a>
+          </li>
+        </ul>
+      </div>
+      <div class="navigation">
+        <h3>Methods</h3>
+        <ul>
+          <li>
+            <a href="#gridAction">gridAction</a>
+          </li>
+          <li>
+            <a href="#indexAction">indexAction</a>
+          </li>
+        </ul>
+      </div>
+      <div class="content">
+        <h2><span style="font-size:60%">\</span>FireGento_MageSetup_Adminhtml_NewsletterController</h2>
+        <div class="file-notice">
+          <p>Newsletter Subscriber Status Adminhtml Controller</p>
+        </div>
+        <ul class="fileinfos">
+          <li><b>Author: </b>FireGento Team &lt;[email protected]&gt;</li>
+          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
+          <li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
+        </ul>
+        <h3>Methods</h3>
+        <ul class="varlist">
+          <li>
+            <a name="gridAction"/>
+            <h4><span class="label public">public</span>gridAction<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Retrieve the new grid layout via ajax requests</li>
+            </p>
+          </li>
+          <li>
+            <a name="indexAction"/>
+            <h4><span class="label public">public</span>indexAction<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Displays the newsletter subscribers status history</li>
+            </p>
+          </li>
+        </ul>
+        <div class="footer">Generated using phpDox 0.5 - Copyright (C) 2010 - 2013 by Arne Blankerts</div>
+      </div>
+    </div>
+  </body>
+</html>