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

361 Commits

Author SHA1 Message Date
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
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
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
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
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
Madhura Jayaratne
b91101e190 Make the method more generic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 10:30:38 +05:30
Hugues Peccatte
39761819c3 Templating getStartAndNumberOfRowsPanel function. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-19 23:22:21 +02:00
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
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
75fb3e6c17 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:39:59 +02:00
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
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
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
c88da15e88 Update doc blocks with proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:24:16 +05:30
Marc Delisle
be25fa7e49 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-06 05:08:02 -04:00
Marc Delisle
41df801262 Fix execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-06 05:07:20 -04:00
Marc Delisle
c749f35258 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-05 19:54:48 -04:00
Madhura Jayaratne
758ec7b5ae Performance improvements: Avoid expensive PMA_Table::analyzeStructure() call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 20:20:02 +05:30
Madhura Jayaratne
f2bbb10ba6 Add missing parameter comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:30:03 +05:30