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

103656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michal Čihař
fde62aad8e Properly handle session expiry after POST requests 
Fixes #11642

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-11-05 09:11:33 +01:00
Weblate
a0f8ea98e1 Merge remote-tracking branch 'origin/master' 2015-11-04 23:36:36 +01:00
Petr Kateřiňák
7faee0e89c Translated using Weblate (Czech) 
Currently translated at 94.6% (3055 of 3228 strings)

[CI skip]
 2015-11-04 23:36:33 +01:00
Kelvin Lee
419cc0c0f6 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3189 of 3228 strings)

[CI skip]
 2015-11-04 23:36:33 +01:00
Marc Delisle
e0a1f50ebc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-04 17:36:24 -05:00
Madhura Jayaratne
4a0b34b438 Merge branch 'QA_4_5' 2015-11-04 19:45:20 +11:00
Madhura Jayaratne
71f86d2c4d Fix bug Profiling checkbox is missing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 19:41:56 +11:00
Madhura Jayaratne
26aeef7088 Merge branch 'QA_4_5' 2015-11-04 17:19:13 +11:00
Madhura Jayaratne
a9fdf9c59f Fix #11639 Bug with the MainBackground Color 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 17:17:03 +11:00
Madhura Jayaratne
e8a191067a Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 09:48:09 +11:00
Madhura Jayaratne
1d0ad159b1 Indicate when there are no parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 08:27:10 +11:00
Madhura Jayaratne
7e96953e83 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-04 07:24:13 +11:00
Madhura Jayaratne
b31248fba4 Fix regression introduced while moving controllers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 07:22:56 +11:00
luke83
67ad1862dd typo 2015-11-03 20:40:56 +01:00
Weblate
2b7fd5461b Merge remote-tracking branch 'origin/master' 2015-11-03 17:15:26 +01:00
Petr Kateřiňák
3c2d43f777 Translated using Weblate (Czech) 
Currently translated at 94.1% (3040 of 3228 strings)

[CI skip]
 2015-11-03 17:15:23 +01:00
Marc Delisle
44be1e68ee Merge branch 'QA_4_5' 2015-11-03 11:15:08 -05:00