gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,131 Commits 12 Branches 481 Tags 2.4 GiB
73d376d14a
Commit Graph

95131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
73d376d14a Remove old @todo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-20 20:17:44 +02:00
Hugues Peccatte
7723908f3f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-20 18:31:27 +02:00
Hugues Peccatte
447d763a48 PHPDoc modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-20 18:31:12 +02:00
Chirayu Chiripal
9187b75424 Fix bad line breaks (coding style) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:59:18 +05:30
Chirayu Chiripal
137c44a5db Fix function was used before it was defined 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:55:04 +05:30
Chirayu Chiripal
22c44a2363 Fix bad line break in js (coding style) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-20 16:47:01 +05:30
Weblate
fcb0ea0c0d Merge remote-tracking branch 'origin/master' 2014-09-20 12:53:28 +02:00
Kyeong Su Shin
b1b9009d7f Translated using Weblate (Korean) 
Currently translated at 80.1% (2375 of 2964)

[ci skip]
 2014-09-20 12:53:24 +02:00
Marc Delisle
3b8d16e88c 4.2.10-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-20 06:53:07 -04:00
Marc Delisle
9d02728163 Merge commit 'ab9036f' 2014-09-20 06:49:28 -04:00
Marc Delisle
ab9036fa60 4.2.10-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-20 06:48:10 -04:00
Weblate
8601ede46b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-20 12:41:06 +02:00
Kyeong Su Shin
9cd65f3db5 Translated using Weblate (Korean) 
Currently translated at 84.6% (2343 of 2768)

[ci skip]
 2014-09-20 12:41:03 +02:00
Marc Delisle
3085e8f4ab 4.2.8.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-20 06:40:29 -04:00
Weblate
42e9a4cbd7 Merge remote-tracking branch 'origin/master' 2014-09-19 13:37:44 +02:00
dingo thirteen
446dd0cfd8 Translated using Weblate (Dutch) 
Currently translated at 99.5% (2951 of 2964)

[ci skip]
 2014-09-19 13:37:40 +02:00
Marc Delisle
a1b13c0d56 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-19 07:37:28 -04:00
Marc Delisle
0809fd14cb Move include file to a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-18 13:01:49 -04:00
Weblate
8187963b27 Merge remote-tracking branch 'origin/master' 2014-09-18 14:05:55 +02:00
Dieter Adriaenssens
9f43eb74f6 Translated using Weblate (Dutch) 
Currently translated at 98.9% (2934 of 2964)

[ci skip]
 2014-09-18 14:05:51 +02:00
Atul Pratap Singh
50aa2df9c2 Merge branch 'QA_4_2' 2014-09-18 17:32:58 +05:30
Dean Moncaster
95911ff20f Sticky column headers were getting wrongly aligned, http://stackoverflow.com/questions/24635110/phpmyadmin-column-headers-move-in-table-when-you-scroll 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-09-18 17:22:18 +05:30
Hugues Peccatte
75be2a0fc4 Merge pull request #1360 from Tithugues/b4528_master 
Fix 14528: Fix SQL import.
 2014-09-17 19:38:18 +02:00
Chanaka Dharmarathna
cf2de639f7 Remove unused variable 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 21:49:55 +05:30
Marc Delisle
176486c36c Merge branch 'QA_4_2' 2014-09-17 09:16:12 -04:00
Marc Delisle
070a9e1d62 bug tbl_structure.js "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 09:15:05 -04:00
Weblate
c4c5810c9d Merge remote-tracking branch 'origin/master' 2014-09-17 14:29:18 +02:00
dingo thirteen
30274535b4 Translated using Weblate (Dutch) 
Currently translated at 98.9% (2933 of 2964)

[ci skip]
 2014-09-17 14:29:14 +02:00
Marc Delisle
d86f1ba247 Merge branch 'QA_4_2' 2014-09-17 08:27:36 -04:00
Marc Delisle
a10d5e15f6 bug ajax.js responseHandler: another "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 08:26:39 -04:00
Hugues Peccatte
d510e19e77 Fix 14528: Fix SQL import. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-16 22:23:42 +02:00
Chanaka Dharmarathna
4c1d1b877f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-17 00:22:30 +05:30
Chanaka Dharmarathna
31da8b1cdc Remove unsed variable 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:21:10 +05:30
Chanaka Dharmarathna
08e8ab1cda Remove unused parameter 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:04:01 +05:30
Chanaka Dharmarathna
fe17e81299 Remove unused variables 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-16 23:19:04 +05:30
Marc Delisle
25cbe79a53 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-16 08:10:33 -04:00
Marc Delisle
64d606ed59 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-16 07:59:18 -04:00
Marc Delisle
e279834262 Merge pull request #1359 from cmyker/master 
Fix: broken skip slave error functionality
 2014-09-16 07:40:56 -04:00
Igor Prokopenkov
d052fd0c51 Fix: broken skip slave error functionality 
libraries/replication_gui.lib.php:908
function PMA_handleControlRequest()
checks for
if (isset($_REQUEST['sr_take_action']))
libraries/replication_gui.lib.php:202
but sr_take_action variable isn't included in $slave_skip_error_link generation

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-15 21:34:09 +03:00
Chanaka Dharmarathna
866a62800d Remove unused variable in _getPlacedLinks() function 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-15 22:25:25 +05:30
Marc Delisle
01740a54f7 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:35:21 -04:00
Marc Delisle
9ab4ade266 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:34:32 -04:00
Weblate
57e1d10b02 Merge remote-tracking branch 'origin/master' 2014-09-15 14:05:09 +02:00
Kyeong Su Shin
54773d9565 Translated using Weblate (Korean) 
Currently translated at 79.6% (2362 of 2964)

[ci skip]
 2014-09-15 14:05:06 +02:00
Marc Delisle
7b619ab00b Merge commit '35dd99c' 2014-09-15 08:03:54 -04:00
Marc Delisle
250482589e Merge commit '6af812e' 2014-09-15 08:03:43 -04:00
Marc Delisle
4ac743f5e9 Merge commit '26b6ba5' 2014-09-15 08:03:06 -04:00
Marc Delisle
f70744ad71 Merge commit '41c0251' 2014-09-15 08:02:47 -04:00
Marc Delisle
35dd99c499 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-09-15 08:02:08 -04:00
Marc Delisle
6af812ee44 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 08:01:57 -04:00