Merge pull request #77 from wenzhixin/master

Update my repo

DONATORS.md

@@ -0,0 +1,16 @@
+## List of donators
+
+* Richard C Jordan - $35
+* Janet Moery - $5
+* Rene Halskov - $10
+* Angel Arambula Garcia - $5
+* David Graham - $5
+* Paul Abbott - $20
+* Philip Tepfer - $10
+* Marcus Eddy - $5
+* Keith Rockhold - $50
+* Ramon Sosa Diaz - $10
+* Goncalo Cordeiro - $25
+* Marzena Wspanialy - $10
+* Nicolas Pascual - $10
+* Hassan Ejaz - $10

README.md

@@ -10,20 +10,7 @@ An extended Bootstrap table with radio, checkbox, sort, pagination, extensions a
 To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Example issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aexample+is%3Aclosed), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
 
 
-**List of donators**
-
-* Richard C Jordan - $35
-* Janet Moery - $5
-* Rene Halskov - $10
-* Angel Arambula Garcia - $5
-* David Graham - $5
-* Paul Abbott - $20
-* Philip Tepfer - $10
-* Marcus Eddy - $5
-* Keith Rockhold - $50
-* Ramon Sosa Diaz - $10
-* Goncalo Cordeiro - $10
-* Marzena Wspanialy - $25
+[**List of donators**](https://github.com/wenzhixin/bootstrap-table/blob/master/DONATORS.md)
 
 ## LICENSE
 

docs/_i18n/en/getting-started/download.md

@@ -18,7 +18,7 @@ Source css, JavaScript, locales, and extensions, along with our docs.
 
 ## CDN
 
-The folks over at [CDNJS](http://www.cdnjs.com/libraries/bootstrap-table) or [bootcss](http://open.bootcss.com/bootstrap-table/) graciously provide CDN support for CSS and JavaScript of Bootstrap table. Just use these CDN links.
+The folks over at [CDNJS](http://www.cdnjs.com/libraries/bootstrap-table) and [bootcss](http://open.bootcss.com/bootstrap-table/) graciously provide CDN support for CSS and JavaScript of Bootstrap table. Just use these CDN links.
 
 ```html
 <!-- Latest compiled and minified CSS -->
@@ -37,4 +37,4 @@ Install and manage Bootstrap table's CSS, JavaScript, locales, and extensions us
 
 ```bash
 $ bower install bootstrap-table
-```
+```

src/extensions/group-by/bootstrap-table-group-by.js

@@ -146,10 +146,7 @@
         originalData: undefined
     });
 
-    $.extend($.fn.bootstrapTable.methods, [
-        'collapseAll',
-        'expandAll'
-    ]);
+    $.fn.bootstrapTable.methods.push('collapseAll', 'expandAll');
 
     $.extend($.fn.bootstrapTable.COLUMN_DEFAULTS, {
         groupBySumGroup: false
@@ -228,4 +225,4 @@
             this.$el.treetable('expandNode', id);
         }
     }
-}(jQuery);
+}(jQuery);

src/locale/bootstrap-table-hu-HU.js

@@ -21,14 +21,20 @@
         formatNoMatches: function () {
             return 'Nincs találat';
         },
+        formatPaginationSwitch: function () {
+            return 'Lapozó elrejtése/megjelenítése';
+        },
         formatRefresh: function () {
             return 'Frissítés';
         },
         formatToggle: function () {
-            return 'Váltás';
+            return 'Összecsuk/Kinyit';
         },
         formatColumns: function () {
             return 'Oszlopok';
+        },
+        formatAllRows: function () {
+            return 'Összes';
         }
     };