Commit Graph

92582 Commits

Author SHA1 Message Date
Chanaka Indrajith
14b0de501c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-18 00:16:51 +05:30
Chanaka Indrajith
39b5f07dfb Fixed some documentation issues raised by scrutinizer
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-05-18 00:14:27 +05:30
Chanaka Indrajith
52bf8f03ed Fixed coding style issue in inser_edit.lib.php file, raised by scrutinizer
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-05-17 23:43:46 +05:30
Weblate
df310df1e5 Merge remote-tracking branch 'origin/master' 2014-05-17 20:10:16 +02:00
Rahoz Yaseen
4d3795e37a Translated using Weblate (Kurdish Sorani)
Currently translated at 17.8% (496 of 2771)
2014-05-17 20:10:13 +02:00
Chanaka Indrajith
4b92e65d01 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-17 18:40:01 +05:30
Chanaka Indrajith
cf6a8ce4e1 Fixed documentation issue related to argument type mismatching in ImportCsv.class.php file, raised by scrutinizer
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-05-17 18:11:10 +05:30
Chanaka Indrajith
7c88895d99 Fixed documentation issue related to argument type mismatching in create_addfield.lib.php file raised by scrutinizer
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-05-17 17:27:12 +05:30
Chanaka Indrajith
2dfdf472a0 Fixed documentation issue related to argument type mismatching, raised by scrutinizer
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-05-17 17:19:12 +05:30
Marc Delisle
5574368089 Merge branch 'QA_4_2' 2014-05-17 07:40:49 -04:00
Marc Delisle
77a0d39790 Merge commit '41c8f76' 2014-05-17 07:40:36 -04:00
Marc Delisle
2986cdcd8a bug #4419 No more calendar into search tab
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-17 07:39:04 -04:00
Marc Delisle
b35e4efee1 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-17 06:10:14 -04:00
Weblate
79f3057ce1 Merge remote-tracking branch 'origin/master' 2014-05-17 09:39:35 +02:00
Sorawee Porncharoenwase
c387bf234a Translated using Weblate (Thai)
Currently translated at 38.5% (1069 of 2772)
2014-05-17 09:39:32 +02:00
Weblate
41c8f76eeb Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-17 09:38:53 +02:00
Sorawee Porncharoenwase
a0140e7aae Translated using Weblate (Thai)
Currently translated at 38.6% (1069 of 2768)
2014-05-17 09:38:50 +02:00
Hugues Peccatte
81cd594ea4 ChangeLog entry
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-17 07:39:09 +02:00
Hugues Peccatte
a0397557fc ChangeLog entry
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-17 07:38:17 +02:00
Marc Delisle
f5e76d1b1d Merge branch 'QA_4_2' 2014-05-16 12:36:52 -04:00
Marc Delisle
52cf4a6491 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 12:36:18 -04:00
Petr Tomรกลกek
99dca5d7a6 Respect ['ShowCreateDb'] in the navi panel
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 12:35:28 -04:00
Marc Delisle
0e483804ff Merge commit 'e2817df' 2014-05-16 12:21:30 -04:00
Marc Delisle
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
ffe8277a2e Merge commit '0dbbab8' 2014-05-16 12:20:38 -04:00
Marc Delisle
152ed86bad Merge commit '0d4d696' 2014-05-16 12:20:25 -04:00
Domen
0da801575e Translated using Weblate (Slovenian)
Currently translated at 100.0% (2771 of 2771)
2014-05-16 17:17:55 +02:00
Marc Delisle
e2817dfdfd Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-16 09:56:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 09:56:47 -04:00
Isaac Bennetch
0dbbab8fdc Merge pull request #1169 from D-storm/bug-4392
Bug #4392: Cannot see databases in nav panel on databases grouping when ...
2014-05-16 09:54:43 -04:00
Isaac Bennetch
5789c674a4 Merge pull request #1184 from D-storm/bug-4417
Bug Fix #4417,#4403: Single-clicking a foreign key causes JS error
2014-05-16 08:47:21 -04:00
Marc Delisle
1a5292e081 Merge commit '453178b' 2014-05-16 07:54:08 -04:00
Marc Delisle
a2978c43d6 Merge commit 'fa1a290' 2014-05-16 07:54:00 -04:00
Marc Delisle
b9b06845ff Merge commit '7f445f9' 2014-05-16 07:53:38 -04:00
Marc Delisle
453178b9cd ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 07:53:05 -04:00
Marc Delisle
fa1a290948 Merge pull request #1183 from D-storm/bug-4411
Bug fix #4411 : Fixed ProtectBinary behaviour on insert operation
2014-05-16 07:51:16 -04:00
Marc Delisle
ebb14cb085 Another case of notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 07:43:57 -04:00
Marc Delisle
afc755f31c Avoid notice of undefined variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-16 07:33:24 -04:00
Chirayu Chiripal
e9a9f442a8 Bug Fix #4417,#4403: Single-clicking a foreign key causes JavaScript error
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-16 10:52:48 +05:30
Marc Delisle
9a81facf41 Merge commit '1365435' 2014-05-15 12:50:16 -04:00
Marc Delisle
62533b7ae9 Merge commit '1fd2567' 2014-05-15 12:50:04 -04:00
Marc Delisle
06d0e5c5dd Merge commit '1a3c958' 2014-05-15 12:49:50 -04:00
Atul Pratap Singh
1a3c958f39 Add datepicker to monmitor log analyzer
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-05-16 02:29:14 +05:30
Marc Delisle
66d1284b0a Merge commit 'fcd437c' 2014-05-15 12:49:37 -04:00
Marc Delisle
3031996acf Merge commit 'aa2c9cd' 2014-05-15 12:47:50 -04:00
Marc Delisle
13654357ff ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-15 12:47:06 -04:00
Marc Delisle
1fd2567e23 Merge remote-tracking branch 'D-storm/Bug-4414' into QA_4_2 2014-05-15 12:42:45 -04:00
Isaac Bennetch
572032bc1f ChangeLog entry for https://github.com/phpmyadmin/phpmyadmin/pull/1180 2014-05-15 12:14:36 -04:00
Weblate
ebad795ac5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-15 17:35:31 +02:00
Anders Jonsson
fcd437cd21 Translated using Weblate (Swedish)
Currently translated at 99.9% (2767 of 2768)
2014-05-15 17:35:28 +02:00