Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit36d7613

Browse files
committed
Merge remote-tracking branch 'upstream/3.0' into addCheckbox
2 parents2759fd9 +acb4276 commit36d7613

File tree

14 files changed

+636
-348
lines changed

14 files changed

+636
-348
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ over other users requests/tickets.
2828
- Operating System
2929
- PHP Version
3030
- Laravel Version
31-
- Laravel-Datatables Version
31+
- Laravel-DataTables Version

‎.styleci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
preset:laravel
2+
3+
enabled:
4+
-align_double_arrow
5+
-align_equals
6+
7+
disabled:
8+
-concat_without_spaces
9+
-unalign_equals

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ php:
44
-5.6
55
-7.0
66
-7.1
7-
-hhvm
87

98
matrix:
109
allow_failures:
11-
-php:hhvm
10+
-php:5.6
1211

1312
env:
1413
global:

‎CHANGELOG.md‎

Lines changed: 166 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,179 @@
1-
##LaravelDatatables Html Plugin.
1+
#LaravelDataTables Html Plugin.
22

33
[![Latest Stable Version](https://poser.pugx.org/yajra/laravel-datatables-html/v/stable.png)](https://packagist.org/packages/yajra/laravel-datatables-html)
44
[![Total Downloads](https://poser.pugx.org/yajra/laravel-datatables-html/downloads.png)](https://packagist.org/packages/yajra/laravel-datatables-html)
55
[![Build Status](https://travis-ci.org/yajra/laravel-datatables-html.png?branch=master)](https://travis-ci.org/yajra/laravel-datatables-html)
66
[![Latest Unstable Version](https://poser.pugx.org/yajra/laravel-datatables-html/v/unstable.svg)](https://packagist.org/packages/yajra/laravel-datatables-html)
77
[![License](https://poser.pugx.org/yajra/laravel-datatables-html/license.svg)](https://packagist.org/packages/yajra/laravel-datatables-html)
88

9-
##Change Log
9+
##CHANGELOG
1010

11-
###v1.2.0 - 03-28-20017
12-
- Add method to remove column by names.#9
11+
###v3.7.0 - 02-21-2018
1312

14-
###v1.1.1 - 03-28-20017
15-
-Fix columns setter.#8
13+
- Adding ajaxParameters to minifiedAjax[#57], credits to@lk77
14+
-Fixes the issue with the missing name attribute default mentioned in[#58]. PR[#59], credits to@Namoshek
1615

17-
###v1.1.0 - 02-03-20017
18-
- Configurable header attributes.#4
16+
###v3.6.0 - 02-11-2018
17+
18+
- Add support for Laravel 5.6.[#56]
19+
20+
###v3.5.2 - 01-11-2018
21+
22+
- Moving callback condition to config[#54], credits to@lk77.
23+
24+
###v3.5.1 - 12-27-2017
25+
26+
- Allow jQuery functions callback.[#52], credits to@OzanKurt.
27+
28+
###v3.5.0 - 12-24-2017
29+
30+
- Improve handling of function callbacks and better editor support.[#49]
31+
32+
###v3.4.0 - 12-18-2017
33+
34+
- Implement buttons support for editor.[#47]
35+
36+
###v3.3.0 - 12-15-2017
37+
38+
- Add postAjax() to Html Builder[#45], credits to@ElfSundae.
39+
- Fixhttps://github.com/yajra/laravel-datatables-html/pull/13#issuecomment-337947000.
40+
41+
###v3.2.1 - 10-18-2017
42+
43+
- Fix HtmlServiceProvider.[#38], credits to@ElfSundae.
44+
- Fix changelog PR links.[#39]
45+
46+
###v3.2.0 - 10-13-2017
47+
48+
- Review tableAttributes getter and setter[#31]
49+
- Fix CS.[#36]
50+
- Add setTableId() to Html Builder[#35].
51+
- Add addTableClass, removeTableClass to Html Builder[#37]
52+
- All changes credits to@ElfSundae.
53+
54+
###v3.1.0 - 09-14-2017
55+
56+
- Added generateJson to Html/Builder[#29], credits to@lk77.
57+
58+
###v3.0.3 - 09-12-2017
59+
60+
- Fix column attributes removed when generate script.[#28], credits to@as247.
61+
- Fixhttps://github.com/yajra/laravel-datatables/issues/1380.
62+
63+
###v3.0.2 - 09-09-2017
64+
65+
- Fix Request class doc blocks.
66+
- Fix typo Datatables to DataTables.
67+
68+
###v3.0.1 - 09-09-2017
69+
70+
- Add fnServerParams to validCallbacks[#26]. Credits to@cracki.
71+
72+
###v3.0.0 - 08-31-2017
73+
74+
- v3.0 stable release.
75+
76+
###v2.0.6 - 07-29-2017
77+
78+
- Adding type GET to minifiedAjax in Html/Builder[#21], credits to@lk77.
79+
80+
###v2.0.5 - 06-29-2017
81+
82+
- Fix fetching of default table id from config.[#19]
83+
84+
###v2.0.4 - 06-29-2017
85+
86+
- Fix missing semi-colon.
87+
88+
###v2.0.3 - 06-29-2017
89+
90+
- Script cleanup[#18]
91+
- Clean up extra space and floating ; on generated ajax data script.
92+
- Do not include attributes on generated column scripts.
93+
94+
###v2.0.2 - 06-29-2017
95+
96+
- Fix parsing of column functions.[#17]
97+
98+
###v2.0.1 - 06-29-2017
99+
100+
- Fix parsing of ajax data where function is rendered as string.[#16]
101+
102+
###v2.0.0 - 06-28-2017
103+
104+
- Add support for Laravel 5.5
105+
- Removed unused classes on constructor.
106+
- UrlGenerator
107+
- FormBuilder
108+
- Fix addCheckbox.
109+
- Use HtmlString when generating table and scripts markup.
110+
- Make default table attributes configurable. Fix[#3]
111+
- Use PHPUNIT 6.x, update tests.
112+
- Add macroable trait for builder extension via macro calls.
113+
114+
###v1.4.1 - 06-26-2017
115+
116+
- Set default ajax url to empty string.
117+
118+
###v1.4.0 - 06-26-2017
119+
120+
- Add minifiedAjax method to minify url generated when using get request.[#13]
121+
- Fixes`php artisan serve` and IE issues on long URL.
122+
- Related Issues:
123+
yajra/laravel-datatables#1225
124+
yajra/laravel-datatables#1205
125+
yajra/laravel-datatables#826
126+
yajra/laravel-datatables#671
127+
etc...
128+
129+
###v1.3.0 - 06-24-2017
130+
131+
- Adding addBefore and addColumnBefore in Builder.
132+
- PR[#12], credits to@lk77.
133+
134+
###v1.2.0 - 03-28-2017
135+
136+
- Add method to remove column by names.[#9]
137+
138+
###v1.1.1 - 03-28-2017
139+
140+
- Fix columns setter.[#8]
141+
142+
###v1.1.0 - 02-03-2017
143+
144+
- Configurable header attributes.[#4]
19145
- Credits to@alfa6661.
20146

21-
###v1.0.0 - 01-27-20017
147+
###v1.0.0 - 01-27-2017
148+
22149
- First release.
150+
151+
[#4]:https://github.com/yajra/laravel-datatables-html/pull/4
152+
[#8]:https://github.com/yajra/laravel-datatables-html/pull/8
153+
[#9]:https://github.com/yajra/laravel-datatables-html/pull/9
154+
[#12]:https://github.com/yajra/laravel-datatables-html/pull/12
155+
[#13]:https://github.com/yajra/laravel-datatables-html/pull/13
156+
[#16]:https://github.com/yajra/laravel-datatables-html/pull/16
157+
[#17]:https://github.com/yajra/laravel-datatables-html/pull/17
158+
[#18]:https://github.com/yajra/laravel-datatables-html/pull/18
159+
[#19]:https://github.com/yajra/laravel-datatables-html/pull/19
160+
[#21]:https://github.com/yajra/laravel-datatables-html/pull/21
161+
[#26]:https://github.com/yajra/laravel-datatables-html/pull/26
162+
[#28]:https://github.com/yajra/laravel-datatables-html/pull/28
163+
[#29]:https://github.com/yajra/laravel-datatables-html/pull/29
164+
[#31]:https://github.com/yajra/laravel-datatables-html/pull/31
165+
[#35]:https://github.com/yajra/laravel-datatables-html/pull/35
166+
[#36]:https://github.com/yajra/laravel-datatables-html/pull/36
167+
[#37]:https://github.com/yajra/laravel-datatables-html/pull/37
168+
[#38]:https://github.com/yajra/laravel-datatables-html/pull/38
169+
[#39]:https://github.com/yajra/laravel-datatables-html/pull/39
170+
[#47]:https://github.com/yajra/laravel-datatables-html/pull/47
171+
[#49]:https://github.com/yajra/laravel-datatables-html/pull/49
172+
[#52]:https://github.com/yajra/laravel-datatables-html/pull/52
173+
[#54]:https://github.com/yajra/laravel-datatables-html/pull/54
174+
[#56]:https://github.com/yajra/laravel-datatables-html/pull/56
175+
[#56]:https://github.com/yajra/laravel-datatables-html/pull/57
176+
[#56]:https://github.com/yajra/laravel-datatables-html/pull/59
177+
178+
[#3]:https://github.com/yajra/laravel-datatables-html/issues/3
179+
[#58]:https://github.com/yajra/laravel-datatables-html/issues/58

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(The MIT License)
22

3-
Copyright (c) 2013-2017 Arjay Angeles<aqangeles@gmail.com>
3+
Copyright (c) 2013-2018 Arjay Angeles<aqangeles@gmail.com>
44

55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
#LaravelDatatables Html Plugin.
1+
#LaravelDataTables Html Plugin.
22

3-
[![Laravel 5.4](https://img.shields.io/badge/Laravel-5.4-orange.svg)](http://laravel.com)
3+
[![Laravel 5.4|5.5](https://img.shields.io/badge/Laravel-5.4|5.5-orange.svg)](http://laravel.com)
44
[![Latest Stable Version](https://img.shields.io/packagist/v/yajra/laravel-datatables-html.svg)](https://packagist.org/packages/yajra/laravel-datatables-html)
55
[![Build Status](https://travis-ci.org/yajra/laravel-datatables-html.svg?branch=master)](https://travis-ci.org/yajra/laravel-datatables-html)
66
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yajra/laravel-datatables-html/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yajra/laravel-datatables-html/?branch=master)
77
[![Total Downloads](https://img.shields.io/packagist/dt/yajra/laravel-datatables-html.svg)](https://packagist.org/packages/yajra/laravel-datatables-html)
88
[![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://packagist.org/packages/yajra/laravel-datatables-html)
99

10-
This package is a plugin of[LaravelDatatables](https://github.com/yajra/laravel-datatables) for generating dataTables script using PHP.
10+
This package is a plugin of[LaravelDataTables](https://github.com/yajra/laravel-datatables) for generating dataTables script using PHP.
1111

1212
##Requirements
13-
-[Laravel 5.4](https://github.com/laravel/framework)
14-
-[Laravel DataTables v7.x](https://github.com/yajra/laravel-datatables)
13+
-[Laravel 5.4|5.5](https://github.com/laravel/framework)
14+
-[Laravel DataTables v7.x|v8.x](https://github.com/yajra/laravel-datatables)
1515

1616
##Documentations
17-
-[LaravelDatatables Documentation](http://datatables.yajrabox.com/docs/laravel-datatables)
17+
-[LaravelDataTables Documentation](http://datatables.yajrabox.com/docs/laravel-datatables)
1818
-[Demo Application](http://datatables.yajrabox.com) is available for artisan's reference.
1919

2020
##Quick Installation
21-
`composer require yajra/laravel-datatables-html:^1.0`
21+
`composer require yajra/laravel-datatables-html:^3.0`
2222

23-
####Service Provider
24-
`Yajra\Datatables\HtmlServiceProvider::class`
23+
####Service Provider (Optional on Laravel 5.5)
24+
`Yajra\DataTables\HtmlServiceProvider::class`
2525

26-
####Publish Assets
26+
####Publish Assets (Optional)
2727
`$ php artisan vendor:publish --tag=datatables-html`
2828

2929
And that's it! Start building out some awesome DataTables!
@@ -46,5 +46,5 @@ If you discover any security related issues, please email [aqangeles@gmail.com](
4646
The MIT License (MIT). Please see[License File](https://github.com/yajra/laravel-datatables-html/blob/master/LICENSE.md) for more information.
4747

4848
##Buy me a coffee
49-
- <ahref='https://pledgie.com/campaigns/29515'><imgalt='Click here to lend your support to: Laravel Datatables and make a donation at pledgie.com !'src='https://pledgie.com/campaigns/29515.png?skin_name=chrome'border='0' ></a>
50-
-<ahref='https://www.patreon.com/bePatron?u=4521203'><imgalt='Become a Patron'src='https://s3.amazonaws.com/patreon_public_assets/toolbox/patreon.png'border='0'width='200px' ></a>
49+
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.me/yajra)
50+
<ahref='https://www.patreon.com/bePatron?u=4521203'><imgalt='Become a Patron'src='https://s3.amazonaws.com/patreon_public_assets/toolbox/patreon.png'border='0'width='200px' ></a>

‎composer.json‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,32 @@
1616
}
1717
],
1818
"require": {
19-
"php":">=5.6.4",
20-
"yajra/laravel-datatables-oracle":"7.*",
21-
"laravelcollective/html":"5.4.*"
19+
"php":">=7.0",
20+
"yajra/laravel-datatables-oracle":"8.*",
21+
"laravelcollective/html":"5.4.*|5.5.*|5.6.*"
2222
},
2323
"require-dev": {
2424
"mockery/mockery":"0.9.*",
25-
"phpunit/phpunit":"~5.7"
25+
"phpunit/phpunit":"~6.0"
2626
},
2727
"autoload": {
2828
"psr-4": {
29-
"Yajra\\Datatables\\":"src/"
29+
"Yajra\\DataTables\\":"src/"
3030
}
3131
},
3232
"autoload-dev": {
3333
"psr-4": {
34-
"Yajra\\Datatables\\Tests\\":"tests/"
34+
"Yajra\\DataTables\\Tests\\":"tests/"
3535
}
3636
},
3737
"extra": {
3838
"branch-alias": {
39-
"dev-master":"1.0-dev"
39+
"dev-master":"3.0-dev"
40+
},
41+
"laravel": {
42+
"providers": [
43+
"Yajra\\DataTables\\HtmlServiceProvider"
44+
]
4045
}
4146
},
4247
"minimum-stability":"dev",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp