gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,191 Commits 12 Branches 481 Tags 2.4 GiB
fed108dbe4
Commit Graph

92191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
fed108dbe4 Move menu resizer to correct folder 
The jquery folder should contain third party libraryes what menu resizer
is not.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 15:00:19 +02:00
Michal Čihař
548c1a57d0 Simplify referencing messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:59:17 +02:00
Michal Čihař
5d55cc7d41 Remove not needed empty block 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:57:56 +02:00
Michal Čihař
2ac44bc701 Correct placement of + 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:55:06 +02:00
Michal Čihař
8bfbfb1411 Ignore tracekit files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:54:03 +02:00
Michal Čihař
a679b8c476 Adjust expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:32:56 +02:00
Michal Čihař
1a5f18df53 Add scrutinizer badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:29:31 +02:00
Michal Čihař
cdc924e027 Share code for defining PMA_MYSQL_CLIENT_API 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:29:31 +02:00
Marc Delisle
04210d1b03 Merge branch 'QA_4_2' 2014-05-06 08:27:13 -04:00
Marc Delisle
b0c1a01556 bug #4385 Grid edit on sorted columns fails 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 08:26:02 -04:00
Michal Čihař
e84e6c0305 Merge pull request #1165 from nijel/cleanup 
Various code cleanups
 2014-05-06 14:13:11 +02:00
Michal Čihař
d7a286c555 The return value here is inconsistent and not used 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:11:57 +02:00
Michal Čihař
fecfa65c82 This function does not return anything 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:11:46 +02:00
Michal Čihař
9be2467109 Adjust docs to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:09:18 +02:00
Michal Čihař
5cf56a9f06 This paramterer is a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:07:49 +02:00
Michal Čihař
c17eea8dba Remove documentation for removed parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:06:24 +02:00
Michal Čihař
1261b26316 Add scrutinizer configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:51:28 +02:00
Michal Čihař
3f21b2816f Get rid of overridable return type 
Separate function for collecting the data from pretty printing it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:26:41 +02:00
Michal Čihař
eba095262b Simplify array initialization 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:21:54 +02:00
Michal Čihař
26df3b2ffb Initialize array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:20:23 +02:00
Michal Čihař
66e2135fb3 Remove break after return 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:19:16 +02:00
Michal Čihař
dbd3583d70 Simplify code for setting $is_https 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:14:48 +02:00
Michal Čihař
b20ba6a9c4 Remove commit status is always set 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:13:48 +02:00
Michal Čihař
fcf3341a5b No need to set start twice 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:13:10 +02:00
Michal Čihař
39550be909 This variable is always set to other value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:12:25 +02:00
Marc Delisle
3241c30ad1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-05 13:14:05 -04:00
Michal Čihař
42950083f6 Workaround waiting for menu 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-05 16:40:27 +02:00
Marc Delisle
7d549c9e81 Merge branch 'QA_4_2' 2014-05-05 06:00:23 -04:00
Marc Delisle
d4cdc62fb0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-05 05:59:33 -04:00
Marc Delisle
3fb5a5e073 Merge pull request #1164 from ashutoshdhundhara/bugfix_4384 
Bug fix: #4384 Incorrect "Rows" total shown when truncating or dropping a table on DB Structure page.
 2014-05-05 05:57:52 -04:00
Michal Čihař
19da9dc4c5 Use different project name for Selenium tests in BrowserStack 
This allows filtering of Travis and Jenkins builds inside BrowserStack.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-05 10:25:51 +02:00
Ashutosh Dhundhara
a0667f85fa Bug fix: #4384 Incorrect "Rows" total shown when truncating or dropping a table on DB Structure page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-05 12:03:16 +05:30
Marc Delisle
e564d8cd99 Merge branch 'QA_4_2' 2014-05-04 13:10:43 -04:00
Marc Delisle
390defcd42 Merge commit '9ecdc4e' 2014-05-04 13:10:31 -04:00
Marc Delisle
519cdacf50 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-04 13:09:56 -04:00
Madhura Jayaratne
5f1eac8202 Merge branch 'QA_4_2' 2014-05-04 19:42:33 +05:30
Weblate
9ecdc4e68d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-04 16:11:02 +02:00
Yungu Kim
6cdd047929 Translated using Weblate (Korean) 
Currently translated at 77.9% (2159 of 2768)
 2014-05-04 16:10:59 +02:00
Madhura Jayaratne
3e5a133e7c Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 2014-05-04 19:40:40 +05:30
Madhura Jayaratne
68761dad91 Update tests to reflect the changes in PMA_GIS_modifyQuery function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-04 19:39:20 +05:30
Weblate
60356e31e6 Merge remote-tracking branch 'origin/master' 2014-05-04 15:15:24 +02:00
Yungu Kim
38862583ff Translated using Weblate (Korean) 
Currently translated at 77.9% (2159 of 2768)
 2014-05-04 15:15:20 +02:00
Marc Delisle
d6f149aaa3 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-04 09:14:48 -04:00
Weblate
9c9ccbaef1 Merge remote-tracking branch 'origin/master' 2014-05-04 12:56:55 +02:00
கணேஷ் குமார்
a0f871533b Translated using Weblate (Tamil) 
Currently translated at 27.8% (772 of 2768)

மதிப்புருபுக்கு தகா வழிமதிப்பு "%s" அளிக்கப்பட்டுள்ளது.
 2014-05-04 12:56:52 +02:00
Madhura Jayaratne
49922f24f9 Merge branch 'QA_4_2' 2014-05-04 16:26:05 +05:30
Weblate
9b27679d13 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-04 12:54:35 +02:00
கணேஷ் குமார்
16a2716c5c Translated using Weblate (Tamil) 
Currently translated at 27.8% (772 of 2768)
 2014-05-04 12:54:33 +02:00
Madhura Jayaratne
bc816af900 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-04 16:24:01 +05:30
Madhura Jayaratne
27202362f0 bug #4313 GIS Visualization Extension does not work with PointFromText() function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-04 16:18:51 +05:30