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

338 Commits

Author SHA1 Message Date
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
Isaac Bennetch
af658d27ee Merge pull request #1708 from devenbansod/rfe701_using_css 
RFE#701 - Print View using CSS - Rewrite
 2015-06-01 14:50:04 -04:00
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 03:57:50 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30
Marc Delisle
2d6cfdd700 Merge pull request #1685 from nisargjhaveri/navi_settings 
Navigation panel settings
 2015-05-22 07:57:28 -04:00
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Madhura Jayaratne
43fbe8bbb3 rfe #1242 Work with --skip-grant-tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 09:56:08 +05:30
Madhura Jayaratne
88b3401c15 Allow providing a callback function to retrieve value if it is not already set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 07:15:07 +05:30
Madhura Jayaratne
114581e97f lower_case_table_names is read only and can be cached 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:58:49 +05:30
Madhura Jayaratne
ad32e09ed0 Indicate that these have been truncated 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 10:44:12 +05:30
Michal Čihař
3c5df878a7 Merge remote-tracking branch 'origin/QA_4_4' 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	libraries/Config.class.php
 2015-05-11 10:03:58 +02:00
Michal Čihař
bdf4612081 Set User-Agent in Util::configureCurl 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 10:01:47 +02:00
Madhura Jayaratne
af1f78902c Prefix private methods with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:11:15 +05:30
Madhura Jayaratne
c59aef5860 Merge branch 'QA_4_4' 2015-05-08 15:41:41 +05:30
Madhura Jayaratne
470d61abaf bug #4894 Deleting without confirmation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:40:47 +05:30
Madhura Jayaratne
7199825abd Long links may be converted to forms 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:53:50 +05:30
Madhura Jayaratne
ae4e5db376 rfe #1413 Explain analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:40:33 +05:30
Marc Delisle
9ff36853b9 Merge branch 'QA_4_4' 2015-05-04 10:54:05 -04:00
Marc Delisle
929a252fe1 Remove extraneous space in class 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-04 10:53:29 -04:00
Madhura Jayaratne
5b8b8bc8dc Merge branch 'QA_4_4' 2015-04-14 22:57:35 +05:30
Madhura Jayaratne
0f3840138f bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 22:56:00 +05:30
Madhura Jayaratne
8af521f550 Merge branch 'QA_4_4' 2015-04-07 10:28:38 +05:30
Madhura Jayaratne
63570bc30f bug #4841 Status page: Mislukte pogingen per uur value is incorrect 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 10:20:12 +05:30
Marc Delisle
04b17cddd2 Merge branch 'QA_4_4' 2015-03-28 14:54:50 -04:00