Merge branch 'master' into master

docs/en/form-select2.md

@@ -31,6 +31,17 @@ $this->form[] = ['label'=>'Category','name'=>'categories_id','type'=>'select2','
 ```
 Add `datatable_format` attribute and fill it with a format. Specify the field name wich you want to show. You may specify the field more than one. Sparate it with a comma. If there is a word in addition to the field name, you must put a single quote in the prefix and suffix to its word. (See the example).
 
+### Attribute Available
+| Name     | Type    | Mandatory | Example |
+| -------- | ------- | ---------- |----------- |
+| dataenum | string  | requiredOne |android;web;ios |
+| datatable | string | requiredOne |tableName,fieldNameToShow |
+| relationship_table | optional | string | relationManyToManyTableName | 
+| datatable_ajax | boolean | optional | default: false |
+| datatable_where | string | optional | status != 'active' |
+| datatable_format | string | optional | id,' - ',name |
+
+
 ## What's Next
 - [Form Input Type: text](./form-text.md)
 

docs/en/helpers.md

@@ -16,6 +16,6 @@
 | CRUDBooster::mainpath($slug=NULL) | To get a module path `e.g : http://localhost/project/public/admin/module_name`|
 | CRUDBooster::adminPath($slug=NULL) | To get an Admin Path `e.g : http://localhost/project/public/admin` |
 | CRUDBooster::getCurrentMethod() | To get the currently method |
-| CRUDBooster::sendEmail($config=[])  | You need to create an email template before use this helper. <br>$data = ['name'=>'John Doe','address'=>'Lorem ipsum dolor...']; CRUDBooster::sendEmail(['to'=>'[email protected]',<br>'data'=>$data,'template'=>'order_success']);   |
+| CRUDBooster::sendEmail($config=[])  | You need to create an email template before use this helper. <br>$data = ['name'=>'John Doe','address'=>'Lorem ipsum dolor...']; CRUDBooster::sendEmail(['to'=>'[email protected]',<br>'data'=>$data,'template'=>'order_success','attachments'=>[]]);   |
 | CRUDBooster::sendNotification($config=[]) | To create a backend notification<br>$config['content'] = "Hellow World";<br>$config['to'] = CRUDBooster::adminPath('some_module');<br>$config['id_cms_users'] = [1,2,3,4,5]; //This is an array of id users<br>CRUDBooster::sendNotification($config);|
 | CRUDBooster::sendFCM($regid,$data) | To send a Google FCM . Before use this helper, please make sure you have setted a Google FCM Server Key at the setting page<br>$regid = ['REGID_GOES_HERE','REGID2_GOES_HERE','ETC...'];<br>$data['title'] = "This is a message title";<br>$data['content'] = "This is a message body";<br>// You can add more key as you need<br>// $data['your_other_key'] =<br>CRUDBooster::sendFCM($regid,$data); |

docs/en/how-add-more-action-button.md

@@ -13,12 +13,14 @@ Open your module controller. Find `$this->addaction` in `cbInit()` method.
 
 ```php
 $this->addaction[] = ['label'=>'Set Active','url'=>CRUDBooster::mainpath('set-status/active/[id]'),'icon'=>'fa fa-check','color'=>'success','showIf'=>"[status] == 'pending'"];
-$this->addaction[] = ['label'=>'Set Pending','url'=>CRUDBooster::mainpath('set-status/pending/[id]'),'icon'=>'fa fa-ban','color'=>'warning','showIf'=>"[status] == 'active'"];
+$this->addaction[] = ['label'=>'Set Pending','url'=>CRUDBooster::mainpath('set-status/pending/[id]'),'icon'=>'fa fa-ban','color'=>'warning','showIf'=>"[status] == 'active'", 'confirmation' => true];
 ```
 It will add **Set Active** button if a row has status 'pending', and the opposite, it will add **Set Pending** if a row has status 'active'
 
 In the `showIf` attribute, you can fill anything condition with any other operator. You can use `[field_name]` as an alias.
 
+If the `confirmation` attribute is set to 'true', a confirm dialogue will show before the action takes place.
+
 Then, lets create a method to update the `products` status. Create a method after `cbInit()` method.
 ```php
 public function getSetStatus($status,$id) {

docs/en/how-to-make-graded-module.md

@@ -32,9 +32,9 @@ $this->sub_module[] = ['label'=>'Photos','path'=>'photos','parent_columns'=>'nam
 | foreign_key | Specify the Foreign Key Field of photos table |
 | button_color | Specify the color of button (primary,warning,success,info) |
 | button_icon | Specify the icon. You can find out at Font Awesome |
-
+| custom_parent_id | Specify the id field. 
 ## What's Next
 - [How To Implement A Many To Many Relationship To Form (E.g : Film -> R <- Actors)](./how-to-many-to-many.md)
 
 ## Table Of Contents
-- [Back To Index](./index.md)
+- [Back To Index](./index.md)

docs/en/installation.md

@@ -23,7 +23,7 @@ CRUDBooster is CRUD Generator for laravel, with the most important features web
 ## Installation
 1. Open the terminal, navigate to your project directory.
 ```php
-$ composer require crocodicstudio/crudbooster=5.3.2.*
+$ composer require crocodicstudio/crudbooster
 ```
 
 2. Add the following class, to "providers" array in the file **config/app.php**
@@ -46,7 +46,7 @@ $ php artisan crudbooster:install
 ## Update
 - Open the terminal, navigate to your project directory.
 ```php
-$ composer require crocodicstudio/crudbooster=5.4.0.*
+$ composer require crocodicstudio/crudbooster
 ```
 - Run the following command at the terminal
 ```php
@@ -64,4 +64,4 @@ $ php artisan crudbooster:update
 - [How To Create A Module (CRUD)](./how-to-create-module.md)
 
 ## Table Of Contents
-- [Back To Index](./index.md)
+- [Back To Index](./index.md)

src/assets/ionic/.gitignore

@@ -0,0 +1,4 @@
+_site
+.sass-cache
+*.scssc
+*.swp

src/assets/ionic/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Drifty (http://drifty.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/assets/ionic/bower.json

@@ -0,0 +1,31 @@
+{
+    "ignore": [
+        "**/.*",
+        "builder",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests"
+    ],
+    "version": "2.0.0",
+    "name": "Ionicons",
+    "license": "MIT",
+    "authors": [
+        "Ben Sperry <[email protected]>",
+        "Adam Bradley <[email protected]>",
+        "Max Lynch <[email protected]>"
+    ],
+    "keywords": [
+        "fonts",
+        "icon font",
+        "icons",
+        "ionic",
+        "web font"
+    ],
+    "main": [
+        "css/ionicons.css",
+        "fonts/*"
+    ],
+    "homepage": "https://github.com/driftyco/ionicons",
+    "description": "Ionicons - free and beautiful icons from the creators of Ionic Framework"
+}