gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,673 Commits 12 Branches 481 Tags 2.4 GiB
3f62b99008
Commit Graph

103673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
3f62b99008 Document the newly allowed false value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 22:23:10 +11:00
Madhura Jayaratne
870c2c448b Fix notices about undefined indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 22:17:10 +11:00
Madhura Jayaratne
407b68441d Fix #11641 Ability to disable the navigationhiding Feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 17:41:11 +11:00
Marc Delisle
739df4a1d8 Merge branch 'QA_4_5' 2015-11-11 13:51:59 -05:00
Marc Delisle
ba24c28eda Fixes #11658 Collation column is empty in table Structure 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-11 13:51:35 -05:00
Marc Delisle
896f0fabfc Remove specific theme-related directives from the doc. 
See rationale here: http://wiki.phpmyadmin.net/pma/2015-11_Meeting#Theme_configuration_directives

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-11 12:07:51 -05:00
Madhura Jayaratne
5eaa8f86e0 Fix #11654 Use a slider for Internal relations in foreign key supported tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-11 07:44:41 +11:00
Dan Ungureanu
ee3090b96f Merge branch 'QA_4_5'. 2015-11-10 20:26:55 +02:00
Marc Delisle
40beea16cc Add column header for foreign key drop-downs 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-10 13:24:47 -05:00
Dan Ungureanu
dd14663326 Added ChangeLog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-11-10 20:20:18 +02:00
Dan Ungureanu
195945a7c5 Merge pull request #11650 from udan11/QA_4_5 
Fixed multiple parser issues (#11646, #11635, #11631, #11626, #11608, #11602).
 2015-11-10 20:15:39 +02:00
Marc Delisle
0187c60d61 Internal relations are probably less commonly used than Foreign key constraints and the display column dialog 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 09:27:23 -08:00
Marc Delisle
06a4c57da1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 05:39:17 -08:00
Hugues Peccatte
bb0094d02d Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:09:29 +01:00
Hugues Peccatte
0df3e58fc8 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:05:36 +01:00
Hugues Peccatte
c3e1c981c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:05:25 +01:00
Hugues Peccatte
7da4dd0031 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:03:04 +01:00
Hugues Peccatte
d80e139bab Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-11-08 15:59:00 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Hugues Peccatte
ea806f645d Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:22:54 +01:00
Hugues Peccatte
0ed6db195b Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:21:04 +01:00
Marc Delisle
c3720ce8bf Merge branch 'QA_4_5' 2015-11-08 05:39:26 -08:00
Marc Delisle
c12b63938b Merge commit '5abebfc' 2015-11-08 05:39:20 -08:00
Weblate
a61b52dca9 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-08 14:38:39 +01:00
Burak Yavuz
b7b6092db0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-08 14:38:39 +01:00
Marc Delisle
0065a02854 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:38:24 -08:00
John Homerstad
711fab59d1 Fixes #11648 Notice in ./export.php#214 Undefined index: quick_or_custom 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:37:46 -08:00
Dan Ungureanu
67265ceff0 Fixed multiple parser issues (#11646, #11635, #11631, #11626, #11608, #11602). 
Updated sql-parser library to udan11/sql-parser@2a3d3b80de (v3.0.5).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-11-08 15:33:08 +02:00
Marc Delisle
9cb51e7bb1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:17:23 -08:00
Marc Delisle
fd46862a4d Merge pull request #11645 from drainx/patch-2 
Fix missing include_once
 2015-11-07 04:16:21 -08:00
Marc Delisle
5d7e216eee Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-07 03:59:44 -08:00
Madhura Jayaratne
26f45609dd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-07 08:09:51 +11:00
Madhura Jayaratne
3e244c89be Hide the jqPlot details inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-07 08:08:20 +11:00
Marc Delisle
e9fc32bf71 Clarify logic 
See https://github.com/dseguy/clearPHP/blob/master/rules/no-implied-if.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-06 07:39:53 -05:00
Madhura Jayaratne
abcb83c462 These scripts are not required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 20:42:00 +11:00
Madhura Jayaratne
06821464bf Use generic charting mechanism for profiling chart as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 20:36:28 +11:00
Madhura Jayaratne
3839d2502f Link license.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 15:54:10 +11:00
Madhura Jayaratne
31b2e776e6 Operate without OpenLayers here as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 15:05:53 +11:00
Madhura Jayaratne
ded3f6382d Hide the checkbox to chose OpenLayers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 13:04:38 +11:00
Madhura Jayaratne
b3349e6bfc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-06 13:02:52 +11:00
Madhura Jayaratne
82e9e60cd5 Function without OpenLayers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 12:51:52 +11:00
drainx
015c051b65 Fix missing include_once 
Originally removed by: 0680c243d1

Signed-off-by: Daniel Rix <Drainx1@live.com>
 2015-11-05 15:26:44 -06:00
Marc Delisle
03d3c30eea Clarify logic 
See https://github.com/dseguy/clearPHP/blob/master/rules/no-implied-if.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-05 15:13:35 -05:00
Weblate
c45adc73d4 Merge remote-tracking branch 'origin/master' 2015-11-05 13:55:22 +01:00
Burak Yavuz
1775e3cd8c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-11-05 13:55:21 +01:00
Marc Delisle
fdf7f7d7ee Merge pull request #11636 from luke83/patch-1 
typo
 2015-11-05 07:55:12 -05:00
Weblate
5abebfccd8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-05 09:12:07 +01:00
Petr Kateřiňák
03df86f8ad Translated using Weblate (Czech) 
Currently translated at 95.7% (3076 of 3211 strings)

[CI skip]
 2015-11-05 09:12:05 +01:00
Kelvin Lee
df5a724e31 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-05 09:12:05 +01:00
Michal Čihař
d34fdc3830 Merge branch 'QA_4_5' 2015-11-05 09:11:53 +01:00