gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,483 Commits 12 Branches 481 Tags 2.4 GiB
899bca57ce
Commit Graph

100483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Παναγιώτης Παπάζογλου
899bca57ce Translated using Weblate (Greek) 
Currently translated at 100.0% (3112 of 3112 strings)

[CI skip]
 2015-06-18 13:56:54 +02:00
Madhura Jayaratne
a1bbe1a63a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 16:11:48 +05:30
Madhura Jayaratne
ab6772f4f7 Pass db name to fix the tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 16:10:50 +05:30
Marc Delisle
cb942d3675 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 06:38:49 -04:00
Marc Delisle
5c11808271 Output of DBG sql is now integrated to the console 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-18 06:38:39 -04:00
Madhura Jayaratne
761403517e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 16:05:31 +05:30
Madhura Jayaratne
ddc820c5f0 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 16:03:21 +05:30
Marc Delisle
cac6955bae Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-18 06:32:09 -04:00
Marc Delisle
c852dcb228 Merge pull request #1736 from nisargjhaveri/debug_console 
[WIP] SQL debugging in console
 2015-06-18 06:29:12 -04:00
Madhura Jayaratne
5eedd7b40b Remove more GLOBALS['db'] 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:56:40 +05:30
Nisarg Jhaveri
e524023def SQL debugging in console 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 15:52:13 +05:30
Madhura Jayaratne
5d78f4ffc0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 15:51:39 +05:30
Madhura Jayaratne
e86112a487 Remove more instances of GLOBALS['db'] usages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:50:33 +05:30
Madhura Jayaratne
e64ed2e8e4 Pass instance variable db instead of GLOBALS db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:46:33 +05:30
Madhura Jayaratne
9c994c741d Use instance variable db rather than the GLOBAL value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:30:48 +05:30
Marc Delisle
7135013df9 Bug #4965 Javascript error with ENUM on Insert tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-18 05:53:49 -04:00
Madhura Jayaratne
365d98d4c6 Revert "Remove unused parameter $db" 
This reverts commit d862940cb3.
 2015-06-18 15:22:32 +05:30
Madhura Jayaratne
6d8bceea8a POST parameter 'db' is already written to GLOBALS in libraries/common.inc.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 14:13:12 +05:30
Madhura Jayaratne
a3c3c57261 Use type hinting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 14:06:21 +05:30
Madhura Jayaratne
d862940cb3 Remove unused parameter $db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 13:56:12 +05:30
Madhura Jayaratne
95e7b6820a Use action passed as a parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 13:25:43 +05:30
Madhura Jayaratne
366cdbfc2f Remove unused parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 13:15:58 +05:30
Madhura Jayaratne
e9e43f9c34 Add type hinting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 13:13:03 +05:30
Madhura Jayaratne
0065c7c452 Remove unused variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 11:47:21 +05:30
Madhura Jayaratne
fd77f8d5f4 Timestamp related bug does not affect MySQL 5. See http://faq.webyog.com/content/35/173/en/problems-with-timestamp-not-null-and-mysql-41.html 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 11:31:55 +05:30
Madhura Jayaratne
6831b34c80 Remove unused variable in foreach 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 11:19:13 +05:30
Madhura Jayaratne
7af4664d29 Remove debug code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:51:06 +05:30
Madhura Jayaratne
2949be7df0 Declare variable at function scope 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:48:17 +05:30
Madhura Jayaratne
25e7671d5d Do not assign on return 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:44:32 +05:30
Madhura Jayaratne
6df6be6520 Remove duplicate styles 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:41:17 +05:30
Madhura Jayaratne
637de2a14d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 10:32:33 +05:30
Madhura Jayaratne
1b799702f3 'event' is defined but never used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:12:49 +05:30
Atul Pratap Singh
365d0e0316 Merge pull request #1727 from gzzhanghao/refactor 
Decompose tbl_*.lib.php scripts
 2015-06-18 02:03:25 +05:30
Marc Delisle
4d3ec49d94 Merge pull request #1738 from nijel/release-sign 
Add support for GPG signing releases
 2015-06-17 14:08:42 -04:00
Isaac Bennetch
69fa764d77 Merge pull request #1739 from devenbansod/1594C 
Fixed small error on server_databases.php
 2015-06-17 09:28:20 -04:00
Deven Bansod
2dab2b34e2 Fixed small error 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-17 23:58:09 +05:30
Marc Delisle
e8a3bb54b8 Shorter example link to release notes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-17 09:02:47 -04:00
Marc Delisle
a393a48d40 4.4.10 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-17 08:13:21 -04:00
Marc Delisle
0683fa8ed7 Merge commit '98a3567' 2015-06-17 08:11:15 -04:00
Weblate
98a3567a9a Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-17 14:08:50 +02:00
Tommy Surbakti
afe5e692d2 Translated using Weblate (Indonesian) 
Currently translated at 76.1% (2312 of 3035 strings)

[CI skip]
 2015-06-17 14:08:47 +02:00
Marc Delisle
22b36e3a13 4.4.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-17 08:08:00 -04:00
Madhura Jayaratne
2c0059cb4d Localize action name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 17:00:40 +05:30
Madhura Jayaratne
eff203659b Organize HTML generation code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 16:53:17 +05:30
Madhura Jayaratne
5cff9dd06a Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 16:44:56 +05:30
Madhura Jayaratne
f9e2a6c813 Use same delete icon 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 16:42:48 +05:30
Madhura Jayaratne
e4bedfffa3 Introduce order for order by clause 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 16:41:00 +05:30
Madhura Jayaratne
696aa86e1f Back quote order by columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 16:12:08 +05:30
Madhura Jayaratne
c98ae18912 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-17 15:42:08 +05:30
Madhura Jayaratne
ffd828a746 Check the corresponding 'show' checkbox when column is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 15:40:51 +05:30