diff --git a/application/libraries/Grocery_CRUD.php b/application/libraries/Grocery_CRUD.php index 56b90a21..f4de77b8 100755 --- a/application/libraries/Grocery_CRUD.php +++ b/application/libraries/Grocery_CRUD.php @@ -2123,6 +2123,8 @@ protected function get_layout() unset($js_files[sha1($this->default_theme_path.'/bootstrap/js/bootstrap/modal.min.js')]); unset($css_files[sha1($this->default_theme_path.'/bootstrap/css/bootstrap/bootstrap.css')]); unset($css_files[sha1($this->default_theme_path.'/bootstrap/css/bootstrap/bootstrap.min.css')]); + unset($css_files[sha1($this->default_theme_path.'/bootstrap-v4/css/bootstrap/bootstrap.css')]); + unset($css_files[sha1($this->default_theme_path.'/bootstrap-v4/css/bootstrap/bootstrap.min.css')]); } if($this->echo_and_die === false) diff --git a/assets/grocery_crud/languages/add-new-lang-string.sh b/assets/grocery_crud/languages/add-new-lang-string.sh index 011c3925..ba0ee133 100644 --- a/assets/grocery_crud/languages/add-new-lang-string.sh +++ b/assets/grocery_crud/languages/add-new-lang-string.sh @@ -2,6 +2,6 @@ for i in *.php do echo "\n" >> $i - echo "\t/* Added in version 1.5.2 */" >> $i - echo "\t\$lang['list_more'] = 'More';\n" >> $i -done + echo "\t/* Added in version 1.5.6 */" >> $i + echo "\t\$lang['list_search_column'] = 'Search {column_name}';\n" >> $i +done \ No newline at end of file diff --git a/assets/grocery_crud/languages/arabic.php b/assets/grocery_crud/languages/arabic.php index 7f237248..4c20631c 100644 --- a/assets/grocery_crud/languages/arabic.php +++ b/assets/grocery_crud/languages/arabic.php @@ -88,3 +88,6 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'المزيد'; + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/bengali.php b/assets/grocery_crud/languages/bengali.php index 4482ee58..d732bb0f 100644 --- a/assets/grocery_crud/languages/bengali.php +++ b/assets/grocery_crud/languages/bengali.php @@ -89,3 +89,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/bulgarian.php b/assets/grocery_crud/languages/bulgarian.php index 7802759e..e05a426e 100644 --- a/assets/grocery_crud/languages/bulgarian.php +++ b/assets/grocery_crud/languages/bulgarian.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/catalan.php b/assets/grocery_crud/languages/catalan.php index a353bcb3..411c2214 100755 --- a/assets/grocery_crud/languages/catalan.php +++ b/assets/grocery_crud/languages/catalan.php @@ -88,3 +88,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/chinese.php b/assets/grocery_crud/languages/chinese.php index e9889aa7..d9ae0404 100644 --- a/assets/grocery_crud/languages/chinese.php +++ b/assets/grocery_crud/languages/chinese.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/croatian.php b/assets/grocery_crud/languages/croatian.php index a95f8c3f..7d272946 100644 --- a/assets/grocery_crud/languages/croatian.php +++ b/assets/grocery_crud/languages/croatian.php @@ -89,3 +89,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'Više'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/czech.php b/assets/grocery_crud/languages/czech.php index 49faae42..e920d49a 100644 --- a/assets/grocery_crud/languages/czech.php +++ b/assets/grocery_crud/languages/czech.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/danish.php b/assets/grocery_crud/languages/danish.php index f3491524..0c023b69 100644 --- a/assets/grocery_crud/languages/danish.php +++ b/assets/grocery_crud/languages/danish.php @@ -87,3 +87,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/dutch.php b/assets/grocery_crud/languages/dutch.php index a772d422..0d5cbb55 100644 --- a/assets/grocery_crud/languages/dutch.php +++ b/assets/grocery_crud/languages/dutch.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/english.php b/assets/grocery_crud/languages/english.php index 37791e8a..4fe2f72f 100644 --- a/assets/grocery_crud/languages/english.php +++ b/assets/grocery_crud/languages/english.php @@ -89,3 +89,6 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/french.php b/assets/grocery_crud/languages/french.php index cbda6998..f7918389 100644 --- a/assets/grocery_crud/languages/french.php +++ b/assets/grocery_crud/languages/french.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'Plus'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/german.php b/assets/grocery_crud/languages/german.php index 4a028092..2586aa30 100644 --- a/assets/grocery_crud/languages/german.php +++ b/assets/grocery_crud/languages/german.php @@ -85,3 +85,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'Mehr'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/greek.php b/assets/grocery_crud/languages/greek.php index d616ea55..14759de0 100644 --- a/assets/grocery_crud/languages/greek.php +++ b/assets/grocery_crud/languages/greek.php @@ -85,3 +85,6 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'Επιπλέον'; + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Αναζήτηση {column_name}'; + diff --git a/assets/grocery_crud/languages/hindi.php b/assets/grocery_crud/languages/hindi.php index 8d606ba3..6d6468db 100644 --- a/assets/grocery_crud/languages/hindi.php +++ b/assets/grocery_crud/languages/hindi.php @@ -90,3 +90,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/hungarian.php b/assets/grocery_crud/languages/hungarian.php index ee3c6284..c1f19abb 100644 --- a/assets/grocery_crud/languages/hungarian.php +++ b/assets/grocery_crud/languages/hungarian.php @@ -88,3 +88,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/indonesian.php b/assets/grocery_crud/languages/indonesian.php index 28d779c1..92997500 100644 --- a/assets/grocery_crud/languages/indonesian.php +++ b/assets/grocery_crud/languages/indonesian.php @@ -92,3 +92,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/italian.php b/assets/grocery_crud/languages/italian.php index 69219915..692dacae 100644 --- a/assets/grocery_crud/languages/italian.php +++ b/assets/grocery_crud/languages/italian.php @@ -71,3 +71,8 @@ $lang['ui_year'] = 'aaaa'; /* Added in version 1.5.2 */ $lang['list_more'] = 'Altro'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/japanese.php b/assets/grocery_crud/languages/japanese.php index b0d30d28..10412997 100644 --- a/assets/grocery_crud/languages/japanese.php +++ b/assets/grocery_crud/languages/japanese.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/korean.php b/assets/grocery_crud/languages/korean.php index 765fca51..565973dc 100644 --- a/assets/grocery_crud/languages/korean.php +++ b/assets/grocery_crud/languages/korean.php @@ -85,3 +85,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/lithuanian.php b/assets/grocery_crud/languages/lithuanian.php index 7a59b22e..b96356f5 100644 --- a/assets/grocery_crud/languages/lithuanian.php +++ b/assets/grocery_crud/languages/lithuanian.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/mongolian.php b/assets/grocery_crud/languages/mongolian.php index 34c2b65f..fe879818 100644 --- a/assets/grocery_crud/languages/mongolian.php +++ b/assets/grocery_crud/languages/mongolian.php @@ -91,3 +91,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/norwegian.php b/assets/grocery_crud/languages/norwegian.php index d71e63f4..0bbcd02a 100644 --- a/assets/grocery_crud/languages/norwegian.php +++ b/assets/grocery_crud/languages/norwegian.php @@ -89,3 +89,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/persian.php b/assets/grocery_crud/languages/persian.php index 55111e3d..0210d4e6 100644 --- a/assets/grocery_crud/languages/persian.php +++ b/assets/grocery_crud/languages/persian.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/polish.php b/assets/grocery_crud/languages/polish.php index aa067d14..0924b799 100644 --- a/assets/grocery_crud/languages/polish.php +++ b/assets/grocery_crud/languages/polish.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/pt-br.portuguese.php b/assets/grocery_crud/languages/pt-br.portuguese.php index de834193..61869c0f 100644 --- a/assets/grocery_crud/languages/pt-br.portuguese.php +++ b/assets/grocery_crud/languages/pt-br.portuguese.php @@ -87,3 +87,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/pt-pt.portuguese.php b/assets/grocery_crud/languages/pt-pt.portuguese.php index d4b7d0b6..e793f161 100644 --- a/assets/grocery_crud/languages/pt-pt.portuguese.php +++ b/assets/grocery_crud/languages/pt-pt.portuguese.php @@ -87,3 +87,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/romanian.php b/assets/grocery_crud/languages/romanian.php index 39c0b7c2..159ab06b 100644 --- a/assets/grocery_crud/languages/romanian.php +++ b/assets/grocery_crud/languages/romanian.php @@ -87,3 +87,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/russian.php b/assets/grocery_crud/languages/russian.php index 72538d6e..6cd8e8fa 100644 --- a/assets/grocery_crud/languages/russian.php +++ b/assets/grocery_crud/languages/russian.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/slovak.php b/assets/grocery_crud/languages/slovak.php index d42cba78..1bc9d82f 100644 --- a/assets/grocery_crud/languages/slovak.php +++ b/assets/grocery_crud/languages/slovak.php @@ -85,3 +85,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/spanish.php b/assets/grocery_crud/languages/spanish.php index e0318af6..06754bc0 100644 --- a/assets/grocery_crud/languages/spanish.php +++ b/assets/grocery_crud/languages/spanish.php @@ -87,3 +87,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'Mas'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/thai.php b/assets/grocery_crud/languages/thai.php index 1798562a..938d967e 100644 --- a/assets/grocery_crud/languages/thai.php +++ b/assets/grocery_crud/languages/thai.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/turkish.php b/assets/grocery_crud/languages/turkish.php index 65b3e98e..6b6b2bbc 100644 --- a/assets/grocery_crud/languages/turkish.php +++ b/assets/grocery_crud/languages/turkish.php @@ -89,3 +89,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/ukrainian.php b/assets/grocery_crud/languages/ukrainian.php index 3ec1d1bf..ac4e6b12 100644 --- a/assets/grocery_crud/languages/ukrainian.php +++ b/assets/grocery_crud/languages/ukrainian.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/assets/grocery_crud/languages/vietnamese.php b/assets/grocery_crud/languages/vietnamese.php index 5207a52b..fdffddf3 100644 --- a/assets/grocery_crud/languages/vietnamese.php +++ b/assets/grocery_crud/languages/vietnamese.php @@ -86,3 +86,8 @@ /* Added in version 1.5.2 */ $lang['list_more'] = 'More'; + + + /* Added in version 1.5.6 */ + $lang['list_search_column'] = 'Search {column_name}'; + diff --git a/change_log.txt b/change_log.txt index ea41434a..db28a6d4 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,3 +1,7 @@ +v 1.5.6 + - Unset bootstrap with more CSS unsets + - Languages updates (Portuguese, Italian, Spanish) + - #367: Missing translation for Search {column_name} v 1.5.5 Add Croatian language - translated by: Siniša Dragičević Martinčić - Small CSS fixes: Datetime and date picker was overflowing in some languages