Merge pull request #1 from opencart/master

Update from original.

.gitattributes

@@ -1,5 +1,7 @@
-text=auto
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Ignore specific directories / files when using export
 /tests export-ignore
 .gitattributes export-ignore
-.gitignore export-ignore
-build.xml export-ignore
+.gitignore export-ignore

.gitignore

@@ -3,43 +3,51 @@
 /upload/config.php
 /upload/admin/config.php
 
-# System Cache Files
-/upload/system/cache/*
-!/upload/system/cache/index.html
-
 # Image File
 !/upload/image/no_image.jpg
 
 # Image Cache Files
 /upload/image/cache/*
 !/upload/image/cache/index.html
 
+# System Cache Files
+/upload/system/storage/cache/*
+!/upload/system/storage/cache/index.html
+
 # Modification Files
-/upload/system/modification/*
-!/upload/system/modification/index.html
+/upload/system/storage/modification/*
+!/upload/system/storage/modification/index.html
 
 # Templates Files
 /upload/image/templates/*
 /upload/image/templates/default.jpg
 
 # Download Files
-/upload/system/download/*
-!/upload/system/download/index.html
+/upload/system/storage/download/*
+!/upload/system/storage/download/index.html
 
-!/upload/data/index.html
+# Upload Files
+/upload/system/storage/upload/*
+!/upload/system/storage/upload/index.html
 
 # Flags 
 # remove sharp char if you want to add flags to gitignore
 # /upload/flags/*
 
 # Log Files
-/upload/system/logs/*
-!/upload/system/logs/index.html
+/upload/system/storage/logs/*
+!/upload/system/storage/logs/index.html
 
 # If you want to ignore install file use following lines [on development mode]
 # /upload/backup.install/*
 # /upload/install/*
 
 # Ignore all vendor files included by composer and the lock file
 /tests/phpunit/vendor/*
-/tests/phpunit/composer.lock
+/tests/phpunit/composer.lock
+
+# Test Config File
+/tests/phpunit/bootstrap.php
+
+# IDE Project files
+/.idea

README.md

@@ -1,34 +1,67 @@
 # OpenCart
 
-
 ## Overview
 
 OpenCart is a free open source ecommerce platform for online merchants. OpenCart provides a professional and reliable foundation from which to build a successful online store.
 
 ## Reporting a bug
-
-Please read the instructions below before you create a bug report.
-
- 1. Use [Google](http://www.google.com) to search for your issue.
- 2. Search the [OpenCart forum](http://forum.opencart.com/viewforum.php?f=161), ask the community if they have seen the bug or know how to fix it.
- 3. Check all open and closed issues on the [GitHub bug tracker](https://github.com/opencart/opencart/issues).
- 4. If your bug is related to the OpenCart core code then please create a bug report on GitHub.
+
+Read the instructions below before you create a bug report.
+
+ 1. Search the [OpenCart forum](http://forum.opencart.com/viewforum.php?f=191), ask the community if they have seen the bug or know how to fix it.
+ 2. Check all open and closed issues on the [GitHub bug tracker](https://github.com/opencart/opencart/issues).
+ 3. If your bug is related to the OpenCart core code then please create a bug report on GitHub.
+ 4. READ the [changelog for the master branch](https://github.com/opencart/opencart/blob/master/changelog.md)
+ 5. Use [Google](http://www.google.com) to search for your issue.
+ 6. Make sure that your bug/issue is not related to your hosting environment.
+
+If you are not sure about your issue, it is always best to ask the community on our [bug forum thread](http://forum.opencart.com/viewforum.php?f=191)
 
 **Important!**
-- If your bug report is not related to the core code (such as a 3rd party module or your server configuration) then the issue will be closed without a reason. You must use the forum or a commercial partner to resolve a 3rd party code issue.
-- If you would like to report a serious security bug please PM an OpenCart moderator on the forum
+- If your bug report is not related to the core code (such as a 3rd party module or your server configuration) then the issue will be closed without a reason. You must contact the extension developer, use the forum or find a commercial partner to resolve a 3rd party code issue.
+- If you would like to report a serious security bug please PM an OpenCart moderator/administrator on the forum. Please do not report concept/ideas/unproven security flaws - all security reports are taken seriously but you must include the EXACT details steps to reproduce it. Please DO NOT post security flaws in a public location.
+
+## Making a suggestion
 
-## How to Contribute
+Please do not create a bug report if you think something needs improving / adding (such as features or change to code standards etc).
 
-Fork the repository, edit and submit a pull request.
+We welcome public suggestions on our [User Voice site](http://opencart.uservoice.com).
+
+## How to contribute
+
+Fork the repository, edit and [submit a pull request](https://github.com/opencart/opencart/wiki/Creating-a-pull-request).
 
 Please be very clear on your commit messages and pull request, empty pull request messages may be rejected without reason.
 
-Your code should be inline with the [OpenCart coding standards](https://github.com/opencart/opencart/wiki/Coding-standards).
+Your code standards should match the [OpenCart coding standards](https://github.com/opencart/opencart/wiki/Coding-standards). We use an automated code scanner to check for most basic mistakes - if the test fails your pull request will be rejected.
+
+## Versioning
+
+The version is broken down into 4 points e.g 1.2.3.4 We use MAJOR.MINOR.FEATURE.PATCH to describe the version numbers.
+
+A MAJOR is very rare, it would only be considered if the source was effectively re-written or a clean break was desired for other reasons. This increment would likely break most 3rd party modules.
+
+A MINOR is when there are significant changes that affect core structures. This increment would likely break some 3rd party modules.
+
+A FEATURE version is when new extensions or features are added (such as a payment gateway, shipping module etc). Updating a feature version is at a low risk of breaking 3rd party modules.
+
+A PATCH version is when a fix is added, it should be considered safe to update patch versions e.g 1.2.3.4 to 1.2.3.5
+
+## Releases
+
+OpenCart will announce to developers 1 week prior to public release of FEATURE versions, this is to allow for testing of their own modules for compatibility. For bigger releases (ones that contain many core changes, features and fixes) an extended period will be considered following an announced release candidate (RC). Patch versions (which are considered safe to update with) may have a significantly reduced developer release period.
+
+The master branch will always contain an "_rc" postfix of the next intended version. The next "_rc" version may change at any time.
+
+Developer release source code will not change once tagged.
+
+If a bug is found in an announced developer release that is significant (such as a major feature is broken) then the release will be pulled. A patch version will be issued to replace it, depending on the severity of the patch an extended testing period may be announced. If the developer release version was never made public then the preceding patch version tag will be removed.
+
+To receive developer notifications about release information, sign up to the newsletter on the [OpenCart website](http://www.opencart.com) - located in the footer. Then choose the developer news option.
 
 ## How to install
 
-Please read the installation instructions included in the repository.
+Please read the installation instructions included in the repository or download file.
 
 ## License
 
@@ -39,5 +72,6 @@ Please read the installation instructions included in the repository.
 - [OpenCart homepage](http://www.opencart.com/)
 - [OpenCart forums](http://forum.opencart.com/)
 - [OpenCart blog](http://www.opencart.com/index.php?route=feature/blog)
-- [How to documents](http://docs.opencart.com/display/opencart/OpenCart+1.5+Home)
-- [Newsletter](http://newsletter.opencart.com/h/r/B660EBBE4980C85C)
+- [How to documents](http://docs.opencart.com/)
+- [Newsletter](http://newsletter.opencart.com/h/r/B660EBBE4980C85C)
+- [User Voice suggestions](http://opencart.uservoice.com)

build.xml

@@ -24,6 +24,16 @@
         </apply>
     </target>
 
+    <target name="csslint" description="Run the CSSLint tool on CSS files">
+        <fileset dir="${basedir}/upload" id="cssfiles.raw">
+            <include name="**/*.css" />
+        </fileset>
+        <pathconvert pathsep=" " property="cssfiles.clean" refid="cssfiles.raw" />
+        <exec executable="csslint" output="${basedir}/tests/csslint.xml">
+            <arg line="--warnings=box-model,floats --errors=ids,important --format=lint-xml ${cssfiles.clean}" />
+        </exec>
+    </target>
+
     <target name="phploc" description="Measure project size using PHPLOC">
         <exec executable="phploc">
             <arg value="--log-csv"/>
@@ -38,5 +48,5 @@
         </exec>
     </target>
 
-    <target name="build" depends="prepare,phpcs,lint,phploc"/>
+    <target name="build" depends="prepare,phpcs,lint,phploc,csslint"/>
 </project>