Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Datatables and support for kaminari #3

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6c4309a
- support kaminari
Nov 15, 2011
909f1c3
- added kaminari dependency
Nov 15, 2011
2cbe05b
kaminari support
Nov 15, 2011
f744d3a
fix total_entries
Nov 15, 2011
75954c9
fix for kaminari
Nov 15, 2011
8a55db5
fix coffee script bug
Nov 15, 2011
61e35e6
fix typo
Nov 15, 2011
a6556b6
-fix indentation
Nov 15, 2011
776c3ac
- update read me
Nov 15, 2011
eaa55ba
update to data tables 1.8.2
Nov 15, 2011
036e82e
- Update data tables to 1.8.2
Nov 15, 2011
a47942e
remove kaminari dependency
Nov 15, 2011
8ebb866
- use ransack for search
Nov 15, 2011
b894cfc
ransack instead of metasearch
Nov 15, 2011
83f6028
use metaSearch
Nov 15, 2011
e2ddefd
- remote will_paginate
Nov 15, 2011
7de9f51
move back to data tables 1.8.1
Nov 15, 2011
7098d23
change script back
Nov 15, 2011
352cbf2
fix indentation
Nov 15, 2011
77a6aa2
-upgrade to datatables 1.8.2
Nov 16, 2011
b86c228
Merge branch 'master' of github.com:artellectual/simple_datatables
Nov 16, 2011
9329bf2
will paginate support
Nov 16, 2011
4497d5f
- version bump
Nov 16, 2011
1a3d2e8
added fn reload ajax plugin
Dec 1, 2011
ad4973c
add support for column filter
Dec 1, 2011
2730a11
remove columnfilter
Dec 2, 2011
396f8c5
added row grouping
Dec 2, 2011
1737e70
remove row grouping
Dec 2, 2011
4b65186
fdfd
Dec 2, 2011
9848d0f
move simple_datatables to app for easier development
Dec 2, 2011
0a303b8
update fnFilter function
Dec 2, 2011
6b03087
fnSetFilteringDisplayFix
Dec 2, 2011
423689a
update delay plugin
Dec 2, 2011
5d5795c
update delay filter
Dec 2, 2011
e4083c8
update filtering delay
Dec 2, 2011
f728f3e
support for search types
Dec 2, 2011
c588f82
switch split key
Dec 2, 2011
4e9fcbb
fix coffee script isse
Dec 2, 2011
399d897
fix bug
Dec 2, 2011
064516f
fdsfs
Dec 2, 2011
405bace
more search option
Dec 2, 2011
dbb36dc
added fnFilterClear
Dec 22, 2011
a94f583
include fnFilterClear
Dec 22, 2011
15887a1
change project to rails-datatables
Dec 22, 2011
6b01338
change project to rails-datatables
Dec 22, 2011
1eaff2c
update gem file
Dec 22, 2011
4aebe51
change name of assets
Dec 22, 2011
d4e357b
change name
Dec 22, 2011
c369161
Update README.rdoc
leereilly Apr 3, 2012
d154622
Merge pull request #1 from leereilly/master
Apr 6, 2012
3493eeb
Made rails version dependency more liberal to allow Rails 3.1 up unti…
seabre May 27, 2012
76f0762
Changed '//= require rails-datatables' to '//= require rails_datatabl…
seabre May 27, 2012
0fb649a
Merge pull request #2 from seabre/master
zacksiri Oct 11, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove row grouping
Signed-off-by: Sakchai Siripanyawuth <sakchai@artellectual.com>
Sakchai Siripanyawuth committed Dec 2, 2011
commit 1737e7073d8402fdc168db25c9a2760f09adc419
478 changes: 0 additions & 478 deletions vendor/assets/javascripts/jquery.dataTables.rowGrouping.js

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/assets/javascripts/simple_datatables.js.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//= require jquery.dataTables
//= require jquery.datatables.fnSetFilteringDelay
//= require jquery.datatables.fnReloadAjax
//= require jquery.dataTables.rowGrouping

root = exports ? this

@@ -70,6 +69,7 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
);

if sSearch
console.log sSearch
op =
if bRegex
"_contains"