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

96580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ffa83ae0d7 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:55:43 -05:00
Marc Delisle
9555a21a3d Another instance of Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:53:20 -05:00
Marc Delisle
a0845e879f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 08:23:31 -05:00
Marc Delisle
9cc22a0414 Merge pull request #1420 from nisargjhaveri/console_focus 
Focus console by clicking on white space
 2014-12-11 08:22:38 -05:00
Madhura Jayaratne
aba1d92362 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:50:22 +05:30
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Madhura Jayaratne
4c69e7a857 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:04:12 +05:30
Madhura Jayaratne
43db57bc19 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-11 15:58:27 +05:30
Madhura Jayaratne
4f1ce1004e bug #4638 Default Export Method setting broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 15:57:19 +05:30
Weblate
8685816f69 Merge remote-tracking branch 'origin/master' 2014-12-11 08:54:45 +01:00
Dongyoung Kim
35976eaf1d Translated using Weblate (Korean) 
Currently translated at 82.7% (2474 of 2989 strings)

[CI skip]
 2014-12-11 08:54:42 +01:00
Aputsiaĸ Niels Janussen
b996c98ad0 Translated using Weblate (Danish) 
Currently translated at 98.1% (2935 of 2989 strings)

[CI skip]
 2014-12-11 08:54:40 +01:00
Madhura Jayaratne
fedb566477 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:24:14 +05:30
Weblate
fef9bfbde1 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-11 08:52:01 +01:00
Dongyoung Kim
7e90cbc8c4 Translated using Weblate (Korean) 
Currently translated at 83.0% (2473 of 2978 strings)

[CI skip]
 2014-12-11 08:51:59 +01:00
Aputsiaĸ Niels Janussen
9b134ebf43 Translated using Weblate (Danish) 
Currently translated at 98.3% (2929 of 2978 strings)

[CI skip]
 2014-12-11 08:51:57 +01:00
Madhura Jayaratne
cb40e81e9c Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:21:31 +05:30
Madhura Jayaratne
077916c82a bug #3794 failure to handle repeating empty columns when importing ODS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:18:28 +05:30
Kyeong Su Shin
abb293e640 Translated using Weblate (Korean) 
Currently translated at 82.3% (2462 of 2989 strings)

[CI skip]
 2014-12-11 03:34:41 +01:00
Kyeong Su Shin
3dc13b1272 Translated using Weblate (Korean) 
Currently translated at 82.6% (2461 of 2978 strings)

[CI skip]
 2014-12-11 03:34:35 +01:00
Marc Delisle
d5e485f4f1 Merge branch 'QA_4_3' 2014-12-10 12:35:02 -05:00
Marc Delisle
8260ae8b75 Bug #4640 Incorrect reference to PHP 6 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 12:34:41 -05:00
Marc Delisle
60b87410fd Fix typo in variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 09:04:42 -05:00
Tekin Birdüzen
bf486ccd1f Fixed typo in variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 09:02:55 -05:00
Marc Delisle
d921d34750 Merge branch 'QA_4_3' 2014-12-10 08:01:47 -05:00
Marc Delisle
ebc7e62d40 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 08:00:58 -05:00
Nisarg Jhaveri
7a1c989b43 Fix bug 4635 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-10 07:58:58 -05:00
Marc Delisle
7ca5600732 Merge pull request #1418 from madhuracj/update 
Update TCPDF to version 6.1.0
 2014-12-10 07:39:16 -05:00
Madhura Jayaratne
a2b6138346 Merge branch 'QA_4_3' 2014-12-10 15:36:32 +05:30
Madhura Jayaratne
8795f7a104 bug #4634 Error reporting creates an infinite loop 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 15:35:19 +05:30
Madhura Jayaratne
00fd7b6ca0 Merge branch 'QA_4_3' 2014-12-10 15:13:46 +05:30
Nisarg Jhaveri
51653e1f28 Focus console by clicking on white space 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-10 15:09:27 +05:30
Madhura Jayaratne
9f58a8188a Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 15:07:17 +05:30
Madhura Jayaratne
76342ae1bf Merge branch 'QA_4_3' 2014-12-10 14:41:22 +05:30
Madhura Jayaratne
f1d9539a7d Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-10 14:38:56 +05:30
Madhura Jayaratne
f39a4e10cd bug #4633 Wrong parameter in fetchValue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 14:35:14 +05:30
Madhura Jayaratne
24e7bf0721 ChangeLog entry for bug #4632 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 14:34:03 +05:30
Weblate
f683214284 Merge remote-tracking branch 'origin/master' 2014-12-10 08:16:27 +01:00
Robin van der Vliet
f990aeb793 Translated using Weblate (Frisian) 
Currently translated at 9.4% (281 of 2989 strings)

[CI skip]
 2014-12-10 08:16:24 +01:00
Sevdimali İsa
4271cdbdf1 Translated using Weblate (Azerbaijani) 
Currently translated at 52.8% (1581 of 2989 strings)

[CI skip]
 2014-12-10 08:16:23 +01:00
Madhura Jayaratne
efdda87f28 Merge branch 'QA_4_3' 2014-12-10 12:45:58 +05:30
Weblate
52f19e2561 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-10 08:11:42 +01:00
Sevdimali İsa
2483e2fab1 Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1584 of 2978 strings)

[CI skip]
 2014-12-10 08:11:40 +01:00
Madhura Jayaratne
7ee1af4fc6 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-10 12:41:22 +05:30
Madhura Jayaratne
ce2474f108 bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query. 
Url may not necessarily have a query part

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 12:39:37 +05:30
Robin van der Vliet
bbc39eb525 Translated using Weblate (Frisian) 
Currently translated at 0.0% (1 of 2989 strings)

[CI skip]
 2014-12-09 19:13:19 +01:00
Marc Delisle
c15d3f8051 Merge branch 'QA_4_3' 2014-12-09 13:06:42 -05:00
Marc Delisle
82c04dc0bd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:06:17 -05:00
Marc Delisle
7deba11168 Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:05:14 -05:00
Marc Delisle
e17ccae612 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 12:52:40 -05:00