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

376 Commits

Author SHA1 Message Date
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
0f80756fe6 Use pre-increment when possible. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:12:09 +02:00
Marc Delisle
a9b022701b Merge branch 'QA_4_5' 2015-09-24 09:47:43 -04:00
Marc Delisle
a7836067db Fixes #11496 Incorrect definition for getTablesWhenOpen() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 09:46:54 -04:00
Madhura Jayaratne
2da36e93b2 Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:35:05 +10:00
Marc Delisle
84a49947e5 Merge pull request #11471 from madhuracj/issue11464 
Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
 2015-09-22 07:02:43 -04:00
Madhura Jayaratne
c3fefc2e4a Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 20:14:51 +10:00
Marc Delisle
a0927dcc47 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 08:19:02 -04:00
Madhura Jayaratne
a134c074cf Merge pull request #11430 from madhuracj/rfe6297 
Fix #6297 Use GET only for read only operations
 2015-09-10 20:01:23 +10:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:39 +10:00
Madhura Jayaratne
6401ad9b54 Merge branch 'QA_4_5' 2015-09-10 00:55:48 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:31:52 +10:00
Madhura Jayaratne
8f0f0c5bbe Merge branch 'QA_4_5' 2015-09-03 10:06:53 +10:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 09:53:34 +10:00
Marc Delisle
02adcde835 Merge branch 'QA_4_5' 2015-08-31 07:02:05 -04:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 17:10:32 +10:00
Madhura Jayaratne
7d0f73cc03 Use a form submission for 'Without PHP code' and 'Submit query' actions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 15:39:19 +10:00
Madhura Jayaratne
16f09bc606 Add new parameter to force add a button instead of a link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 15:39:17 +10:00
Marc Delisle
8e3f821eba Remove dead code 
Initialize array

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 15:19:47 -04:00
Madhura Jayaratne
88710c5312 Fix #11434 Class 'SqlParser\Lexer' not found 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-27 13:07:29 +10:00
Marc Delisle
16405633a4 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-26 05:56:13 -04:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:57:42 +10:00
Marc Delisle
bb01f9b2b7 Refactor db_info.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-25 11:16:59 -04:00
Madhura Jayaratne
a451c80370 Use sentence case - more instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 21:24:41 +10:00
Hugues Peccatte
62ed7992a8 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:27:25 +02:00
Hugues Peccatte
6bb56cf491 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:03:10 +02:00
Marc Delisle
c49fd9a3c7 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 09:53:33 -04:00
Hugues Peccatte
6a93a350cc Templating ul tag. 
Templating li tag.
Use li template in getHtmlTab.
Use ul/li templates in libraries/user_preferences.inc.php.
Add/update PHPDoc of templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 14:24:44 +02:00
Madhura Jayaratne
c0ddc89eb1 Fix missing space between the icon and text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:50:56 +05:30
Dan Ungureanu
b6fc66649e Added tests for sql.lib.php and parse_analyze.inc.php. 
Removed dead code.
Fixed miscellaneous issues.
Fixed a bug in PMA_isJustBrowsing().
Updated sql-parser library to udan11/sql-parser@e713c9f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Madhura Jayaratne
12a4c93da6 Allow linking 5.7 doc links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 08:09:45 +05:30
Hugues Peccatte
b92c1f4fdd Update PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 15:32:27 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Marc Delisle
14e8e4b3ff - Remove code duplication 
- Improve variable name

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-16 14:22:35 -04:00
Madhura Jayaratne
ae3fba2683 rfe #1517 Support for virtual/persistent columns in MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 10:45:04 +05:30
Madhura Jayaratne
a3285a7cd3 Support MySQL 5.7.5 virtual columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 15:14:15 +05:30
Dan Ungureanu
617f807c57 Minor fixes. 
Updated sql-parser library to udan11/sql-parser@d8b3a98.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:19 +03:00
Dan Ungureanu
8fb797ebe1 Fixed coding style. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:19 +03:00
Dan Ungureanu
c123e0f7b4 Replaced the old parser in utilities. 
Updated sql-parser library to udan11/sql-parser@9478c9a.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
c34cf9ff29 More refactoring. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
2826b6b328 More refactoring. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
105a1275e5 Fixed failing test. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:12 +03:00
Dan Ungureanu
096492438a Replaced PMA_SQPdata_forbidden_word with the method implemented in lexer. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:11 +03:00
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Marc Delisle
d8861570f4 Clarify boolean method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-28 06:33:29 -04:00
Michal Čihař
52ea1026ad Remove type annotation 
It seems to be broken on some PHP versions:

Argument 1 passed to PMA_Util::configureCurl() must be an instance of
resource, resource given, called in libraries/Config.class.php on line
774 and defined

Seen this on my workstation with PHP 5.6.1 and Google shows some hits of
this as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:49 +02:00
Atul Pratap Singh
7d8faa6818 Merge pull request #1748 from Tithugues/templating_master 
Templating getStartAndNumberOfRowsPanel function, recursivity and failures
 2015-06-22 13:54:46 +05:30