gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,294 Commits 12 Branches 481 Tags 2.4 GiB
5600a8090f
Commit Graph

93294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
5600a8090f Merge pull request #1226 from WhaleWatching/update_cm 
Update codemirror, because cursor in old version had a wrong position.
 2014-06-16 10:54:59 +02:00
Kristjan Räts
626c1ecb4e Translated using Weblate (Estonian) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-16 08:31:47 +02:00
Marc Delisle
1ee589fdb9 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 13:25:29 -04:00
Weblate
c5eab29efe Merge remote-tracking branch 'origin/master' 2014-06-15 16:11:35 +02:00
Giovanni Sora
1b5001d7b5 Translated using Weblate (Interlingua) 
Currently translated at 51.4% (1441 of 2802)
 2014-06-15 16:11:31 +02:00
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
75d9ee572c Merge commit '7279e1b' 2014-06-15 10:10:10 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 10:07:38 -04:00
Marc Delisle
c43df7d140 Clarify parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 17:42:08 -04:00
Burak Yavuz
3cd16f17f0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 21:13:29 +02:00
Marc Delisle
f6c44d8ccb Merge pull request #1230 from smita786/gsoc_central_columns_list 
PHPUnit test case for central_columns.lib.php
 2014-06-14 14:27:08 -04:00
Marc Delisle
d4a45f66cc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:36:55 -04:00
Smita Kumari
b663334c5b PHPUnit test case 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding styl

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-14 22:06:37 +05:30
Marc Delisle
03fb581447 Refactor vertical display links 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:34:06 -04:00
Marc Delisle
d4809ced56 Merge pull request #1229 from D-storm/table-search 
fix: call to undefined function on table search
 2014-06-14 11:03:35 -04:00
Marc Delisle
0e5e0afc9a Merge pull request #1227 from D-storm/reset-bug 
fix: reset form button not resetting lock
 2014-06-14 10:56:41 -04:00
Weblate
e9236eeaca Merge remote-tracking branch 'origin/master' 2014-06-14 15:22:09 +02:00
Haval Abdulkarim
a0a1c8d5a5 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.4% (516 of 2802)
 2014-06-14 15:22:05 +02:00
Haval Abdulkarim
5cb05681a7 Translated using Weblate (English (United Kingdom)) 
Currently translated at 88.4% (2478 of 2802)
 2014-06-14 15:22:03 +02:00
Marc Delisle
dcb4163369 Merge commit 'a33fcad' 2014-06-14 09:21:04 -04:00
Marc Delisle
d387040b36 Merge commit 'a7703a3' 2014-06-14 09:20:50 -04:00
Weblate
7279e1b7f8 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-14 15:20:38 +02:00
Haval Abdulkarim
6c7efa1db7 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.6% (517 of 2770)
 2014-06-14 15:20:34 +02:00
Haval Abdulkarim
aaeed70997 Translated using Weblate (English (United Kingdom)) 
Currently translated at 89.6% (2483 of 2770)
 2014-06-14 15:20:31 +02:00
Marc Delisle
a33fcad037 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:19:56 -04:00
Christian Simon
47709d414e Fix 'token mismatch' due to missing server parameter for some AJAX requests 
* server_privileges user duplicate request
* js error_reporting
* cf. https://sourceforge.net/p/phpmyadmin/bugs/3893

Signed-off-by: Christian Simon <simon@swine.de>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:16:53 -04:00
Marc Delisle
36864a1213 Translated using Weblate (French) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 12:51:48 +02:00
Domen
9dd884f4a0 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 11:57:52 +02:00
Panagiotis Papazoglou
10fd7bb7de Translated using Weblate (Greek) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 10:05:41 +02:00
Panagiotis Papazoglou
a7703a3644 Translated using Weblate (Greek) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-14 10:00:21 +02:00
Chirayu Chiripal
742e1d13d2 fix: call to undefined function on table search 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-14 13:22:19 +05:30
Chirayu Chiripal
967c8f641c fix: reset form button not resetting lock 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-14 12:15:54 +05:30
Edward Cheng
6eeedfaf37 Update codemirror, because cursor in old version had a wrong position. 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-14 12:52:02 +08:00
Matías Bellone
b857076fd1 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 01:05:39 +02:00
Marc Delisle
eac7b1d49b Update po files 2014-06-13 16:52:54 -04:00
Marc Delisle
c607dad041 Merge pull request #1222 from D-storm/bug-4415 
Bugfix 4415,4453,4452,4451;  RFE-1518 (Navigate away) improvements
 2014-06-13 16:51:39 -04:00
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 23:56:24 +05:30
Weblate
239f4c0b8c Merge remote-tracking branch 'origin/master' 2014-06-13 15:44:50 +02:00
Dieter Adriaenssens
f0a7cece5c Translated using Weblate (Dutch) 
Currently translated at 99.8% (2800 of 2803)
 2014-06-13 15:44:47 +02:00
Isaac Bennetch
85fdd3cef3 Merge branch 'D-storm-so' 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:43:56 -04:00
Isaac Bennetch
ddadc4853e Merge branch 'D-storm-so' into QA_4_2 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:40:15 -04:00
Weblate
fe93f9e740 Merge remote-tracking branch 'origin/master' 2014-06-13 13:45:24 +02:00
Dieter Adriaenssens
e43d09bb3b Translated using Weblate (Dutch) 
Currently translated at 99.7% (2796 of 2803)
 2014-06-13 13:45:20 +02:00
Marc Delisle
052eb0ecac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:44:39 -04:00
Marc Delisle
f9d842fd72 Merge commit '0306e2b' 2014-06-13 07:43:11 -04:00
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00
Atul Pratap Singh
0306e2bd88 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:20:27 +05:30
Atul Pratap Singh
d909aa66b7 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:10:23 +05:30
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 00:39:28 +05:30
Michal Čihař
a7bc3a73a3 Do not pas arround empty $_url_params variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00