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

100507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristjan Räts
9fda0a4419 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3116 of 3116 strings)

[CI skip]
 2015-06-19 16:32:47 +02:00
Michal Čihař
0676cd2c30 Merge remote-tracking branch 'weblate-master/master' 2015-06-19 15:12:35 +02:00
Michal Čihař
4a7778f56f Generate sigs/sums for .xz archive as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-19 15:12:31 +02:00
Marc Delisle
723d693439 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-19 08:39:44 -04:00
Weblate
e9a1720f6a Merge remote-tracking branch 'origin/master' 2015-06-19 14:39:17 +02:00
Giovanni Sora
19e7c3ce2e Translated using Weblate (Interlingua) 
Currently translated at 69.5% (2167 of 3115 strings)

[CI skip]
 2015-06-19 14:39:13 +02:00
Marc Delisle
7e58890168 Explain a setting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-19 08:39:03 -04:00
Kristjan Räts
763d286cc0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3115 of 3115 strings)

[CI skip]
 2015-06-19 14:19:15 +02:00
Marc Delisle
a8f1bf2038 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-19 07:20:18 -04:00
Marc Delisle
019d4b1c24 Merge pull request #1745 from nisargjhaveri/debug_console 
Show percentage of time taken in console SQL debug
 2015-06-19 07:19:30 -04:00
Marc Delisle
4d7f76f721 Translated using Weblate (French) 
Currently translated at 100.0% (3112 of 3112 strings)

[CI skip]
 2015-06-19 12:49:55 +02:00
Nisarg Jhaveri
ce55e4acd1 Show percentage of time taken in console SQL debug 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-19 12:07:09 +05:30
Madhura Jayaratne
c2e7e6a0d1 Merge pull request #1742 from nisargjhaveri/clean_config 
Use stricter jQuery selectors in config.js
 2015-06-19 06:30:00 +05:30
Marc Delisle
6614693dc4 Merge pull request #1743 from nisargjhaveri/debug_console 
Add no_debug to git revision check
 2015-06-18 14:12:21 -04:00
Nisarg Jhaveri
4dfd29f55f Add no_debug to git revision check 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 22:05:25 +05:30
Nisarg Jhaveri
7d76949cec Use stricter jQuery selectors in config.js 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 21:44:46 +05:30
Burak Yavuz
2048714b5c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3112 of 3112 strings)

[CI skip]
 2015-06-18 18:07:44 +02:00
Weblate
45e8d55514 Merge remote-tracking branch 'origin/master' 2015-06-18 17:49:40 +02:00
Kristjan Räts
d3dced3d16 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3112 of 3112 strings)

[CI skip]
 2015-06-18 17:49:37 +02:00
Marc Delisle
72833685b7 Merge pull request #1741 from nisargjhaveri/debug_console 
Group/Ungroup queries in console SQL debug
 2015-06-18 11:49:36 -04:00
Nisarg Jhaveri
d608832a9d Group/Ungroup queries in console SQL debug 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 20:23:53 +05:30
Michal Čihař
8636f7ef29 Upload md5 and sha1 checksums to our file server only 
It makes no sense to push this to sf.net, it would only confuse users
there. And in the end we need them on our download server.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-18 15:28:35 +02:00
Michal Čihař
bf3909924b Fix syntax error in markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-18 14:41:27 +02:00
Michal Čihař
afdd2355c8 Generate SHA1 and MD5 sums while releasing as well 
So far we've relied on this being generated on sf.net side, what really
does not guarantee anything.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-18 14:38:01 +02:00
Παναγιώτης Παπάζογλου
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