Merge pull request #1 from Sylius/master

Update from Sylius
Sylius · Feb 14, 2017 · 7ab81cc · 7ab81cc
2 parents 837fd85 + 8800f74
commit 7ab81cc
Show file tree

Hide file tree

Showing 88 changed files with 4,582 additions and 220 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -115,7 +115,7 @@
 * Custom options for filter form types was extracted from ``options`` to ``form_options`` in grid configuration.
 
 Before:
-```php
+```yaml
     sylius_grid:
         grids:
             app_order:
@@ -128,7 +128,7 @@ Before:
 ```
 
 After:
-```php
+```yaml
     sylius_grid:
         grids:
             app_order:
@@ -141,6 +141,14 @@ After:
                             class: "%app.model.channel%"
 ```
 
+* Grid configuration was upgraded to allow setting the number of maximum visible items per page on index.
+```yaml
+    sylius_grid:
+        grids:
+            app_order:
+                limits: [15, 20, 30]
+```
+
 ### Inventory / InventoryBundle
 
 ### Locale / LocaleBundle

diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -18,5 +18,6 @@ The REST API Reference
     shipping_categories
     payments
     promotions
+    taxons
 
 .. include:: /api/map.rst.inc
diff --git a/docs/api/map.rst.inc b/docs/api/map.rst.inc
@@ -12,3 +12,4 @@
 * :doc:`/api/shipping_categories`
 * :doc:`/api/payments`
 * :doc:`/api/promotions`
+* :doc:`/api/taxons`