Merge branch 'release/3.0.0'

craftcms · Apr 4, 2018 · 1826326 · 1826326
2 parents c638b66 + 9eb25df
commit 1826326
Show file tree

Hide file tree

Showing 191 changed files with 6,589 additions and 11,040 deletions.
diff --git a/CHANGELOG.md → CHANGELOG-v2.md b/CHANGELOG.md → CHANGELOG-v2.md
@@ -1,6 +1,19 @@
-# Craft CMS Changelog
+# Release Notes for Craft CMS 2.x
 
-## Unreleased
+## 2.6.3014 - 2018-04-04
+
+## Changed
+- Renamed the Personal edition to “Solo”.
+- Updated Redactor to 2.12.
+
+### Fixed
+- Fixed a bug where Rich Text fields weren’t respecting the `toolbarFixed` Redactor config option.
+- Fixed a bug where Rich Text fields would not honor the `imageTag` config setting when inserting an image.
+- Fixed a bug where the `modifyAssetFilename` hook was being run twice on asset upload. ([#2624](https://github.com/craftcms/cms/issues/2624)
+
+### Security
+- The `preventUserEnumeration` config setting is now applied to locked user accounts.
+- Fixed a bug where an exception could expose a partial server path in some circumstances.
 
 ## 2.6.3013 - 2018-03-23
 

diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
diff --git a/README.md b/README.md
@@ -8,12 +8,12 @@ Learn more about Craft at [craftcms.com](https://craftcms.com).
 
 ## How to Install Craft 3
 
-See the Craft 3 documentation for [installation](https://github.com/craftcms/docs/blob/v3/en/installation.md) and [updating](https://github.com/craftcms/docs/blob/v3/en/upgrade.md) instructions.
+See the Craft 3 documentation for [installation](https://docs.craftcms.com/v3/installation.html) and [updating](https://docs.craftcms.com/v3/upgrade.html) instructions.
 
 ## Resources
 
 #### Official Resources
-- [Craft 3 Documentation](https://github.com/craftcms/docs)
+- [Craft 3 Documentation](https://docs.craftcms.com/v3/)
 - [Craft 3 Class Reference](https://docs.craftcms.com/api/v3/)
 - [Craft 3 Plugins](https://plugins.craftcms.com)
 - [Demo site](https://demo.craftcms.com/)

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.0.0-RC17.1",
+  "version": "3.0.0",
   "keywords": [
     "cms",
     "craftcms",

diff --git a/lib/axios/axios.js b/lib/axios/axios.js
diff --git a/lib/axios/axios.js.map b/lib/axios/axios.js.map
diff --git a/lib/bootstrap/js/bootstrap.js b/lib/bootstrap/js/bootstrap.js
diff --git a/lib/bootstrap/js/bootstrap.js.map b/lib/bootstrap/js/bootstrap.js.map
diff --git a/lib/d3/d3.js b/lib/d3/d3.js
diff --git a/lib/d3/d3.js.map b/lib/d3/d3.js.map
diff --git a/lib/element-resize-detector/element-resize-detector.js b/lib/element-resize-detector/element-resize-detector.js
diff --git a/lib/element-resize-detector/element-resize-detector.js.map b/lib/element-resize-detector/element-resize-detector.js.map
diff --git a/lib/fabric/fabric.js b/lib/fabric/fabric.js
diff --git a/lib/fabric/fabric.js.map b/lib/fabric/fabric.js.map
diff --git a/lib/garnishjs/garnish.js b/lib/garnishjs/garnish.js
diff --git a/lib/garnishjs/garnish.js.map b/lib/garnishjs/garnish.js.map
diff --git a/lib/inputmask/jquery.inputmask.bundle.js b/lib/inputmask/jquery.inputmask.bundle.js
diff --git a/lib/inputmask/jquery.inputmask.bundle.js.map b/lib/inputmask/jquery.inputmask.bundle.js.map
diff --git a/lib/jquery.payment/jquery.payment.js b/lib/jquery.payment/jquery.payment.js
diff --git a/lib/jquery.payment/jquery.payment.js.map b/lib/jquery.payment/jquery.payment.js.map
diff --git a/lib/jquery/jquery.js b/lib/jquery/jquery.js
diff --git a/lib/jquery/jquery.js.map b/lib/jquery/jquery.js.map
diff --git a/lib/picturefill/picturefill.js b/lib/picturefill/picturefill.js
diff --git a/lib/picturefill/picturefill.js.map b/lib/picturefill/picturefill.js.map
diff --git a/lib/punycode/punycode.js b/lib/punycode/punycode.js
diff --git a/lib/punycode/punycode.js.map b/lib/punycode/punycode.js.map
diff --git a/lib/selectize/selectize.js b/lib/selectize/selectize.js
diff --git a/lib/selectize/selectize.js.map b/lib/selectize/selectize.js.map