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

100363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
175fb2f4b7 Match returned value with documented type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 06:49:01 -04:00
Marc Delisle
9bb7e9fea1 Clarify doc due to new verification introduced 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 06:23:57 -04:00
Marc Delisle
0345d572ed Merge pull request #1731 from sibprogrammer/master 
Prohibit the ability to check version if it was disabled.
 2015-06-15 06:17:01 -04:00
Madhura Jayaratne
a8fe40ab50 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-15 15:20:35 +05:30
Madhura Jayaratne
c2e91186d2 Allow specifying resize direction 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-15 15:19:27 +05:30
Michal Čihař
dd97bf650f Fix port for connecting to files server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-15 08:18:50 +02:00
Madhura Jayaratne
e3449c9372 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-15 08:55:08 +05:30
Madhura Jayaratne
72cc1f9f51 bug #4958 Designer Javascript error with specially crafted table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-15 08:53:16 +05:30
Marc Delisle
84fa181135 Bug #4933 INSERT validation issues with MySQL functions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-14 17:09:27 -04:00
Weblate
7818482964 Merge remote-tracking branch 'origin/master' 2015-06-14 21:23:59 +02:00
Jozef Pistej
ea9178f458 Translated using Weblate (Slovak) 
Currently translated at 83.9% (2605 of 3102 strings)

[CI skip]
 2015-06-14 21:23:55 +02:00
Kurt Eilertsen
b5eb5a3e1b Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.5% (1940 of 3102 strings)

[CI skip]
 2015-06-14 21:23:51 +02:00
Alexei Yuzhakov
645cf9f978 Prohibit the ability to check version if it was disabled. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-14 20:46:11 +06:00
Hugues Peccatte
7f8c708dde Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-06-14 13:53:39 +02:00
Hugues Peccatte
60dd86ad70 Merge pull request #1730 from Tithugues/b4957_master 
Fix #4957 "With selected" links doesn't work in table browse
 2015-06-14 13:53:09 +02:00
Hugues Peccatte
37f6b992da Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:50:57 +02:00
Hugues Peccatte
75fb3e6c17 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:39:59 +02:00
Hugues Peccatte
9867e4459b Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:36:16 +02:00
Hugues Peccatte
8d443b08a5 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:22:52 +02:00
Hugues Peccatte
ac620cc224 Fix #4957 "With selected" links doesn't work in table browse 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 12:54:04 +02:00
Marc Delisle
10437a807c Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-14 06:47:00 -04:00
Madhura Jayaratne
734d0684e5 Merge pull request #1723 from madhuracj/qbe 
QBE improvements including bug fixes
 2015-06-14 07:46:57 +05:30
Hugues Peccatte
3f8dab6d33 Make PHPcs happy. 
Add missing PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 00:49:19 +02:00
Isaac Bennetch
79b43e1c8a Merge pull request #1729 from devenbansod/1594C 
Corrected small error in PR #1720
 2015-06-13 12:29:25 -04:00
Deven Bansod
0709cb606b Corrected small error in PR#1720 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-14 01:56:19 +05:30
Marc Delisle
adc34b7638 Merge pull request #1726 from nisargjhaveri/fk_check_tbl_op 
Foreign key checkbox for empty/drop in table operation
 2015-06-13 10:34:40 -04:00
Nisarg Jhaveri
8f242871dc Foreign key checkbox for empty/drop in table operation 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-13 19:51:28 +05:30
Marc Delisle
18b0a957bd Remove tab characters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-13 07:24:51 -04:00
Domen
acd51bc039 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-13 11:41:49 +02:00
Burak Yavuz
148cd13b28 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-13 09:20:50 +02:00
Madhura Jayaratne
40a19030ec Merge branch 'master' into qbe 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:46:33 +05:30
Madhura Jayaratne
b7fabb63be Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-13 07:36:51 +05:30
Madhura Jayaratne
5a149202dc Fix typos 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:35:12 +05:30
Madhura Jayaratne
794a6d805d Match HTML tags 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:22:28 +05:30
Hugues Peccatte
3827e3e988 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-12 22:24:32 +02:00
Isaac Bennetch
10f5d6e586 Changelog for rfe 1594 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-12 15:18:39 -04:00
Weblate
83b1a3fdcb Merge remote-tracking branch 'origin/master' 2015-06-12 21:13:42 +02:00
Burak Yavuz
fa268f9b6c Translated using Weblate (Turkish) 
Currently translated at 99.9% (3101 of 3102 strings)

[CI skip]
 2015-06-12 21:13:39 +02:00
Kurt Eilertsen
26f271cfa6 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 61.1% (1897 of 3102 strings)

[CI skip]
 2015-06-12 21:13:36 +02:00
Isaac Bennetch
cad0eda2c7 Merge pull request #1720 from devenbansod/rfe1594 
RFE#1594: Use plain English descriptors instead of script names for Browse, SQL, Privileges, etc links
 2015-06-12 15:13:34 -04:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Weblate
bc276389cb Merge remote-tracking branch 'origin/master' 2015-06-12 17:03:14 +02:00
Kurt Eilertsen
0491bb8e41 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.7% (1884 of 3102 strings)

[CI skip]
 2015-06-12 17:03:11 +02:00
Marc Delisle
aa6ec4be0a Merge pull request #1725 from nisargjhaveri/fk_check_sql 
Foreign key check checkbox for empty/drop table in db_structure
 2015-06-12 11:03:08 -04:00
Nisarg Jhaveri
4ca5064aeb Fix tests 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Madhura Jayaratne
393aa8e694 Add master table only if it's not empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:31:02 +05:30
Madhura Jayaratne
8dacdd198e Move the column count obtaining logic to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:24:47 +05:30
Madhura Jayaratne
d42e05b9f8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-12 17:35:57 +05:30
Madhura Jayaratne
a759ac0185 Bug #4954 Warnings on query results refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 17:33:42 +05:30