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

49 Commits

Author SHA1 Message Date
Michal Čihař
2c90866b18 Merge branch 'QA_4_6' 2016-11-08 14:46:01 +01:00
Deven Bansod
9be7c55bd0 Allow for proper MySQL-allowed strings as identifiers 
Fix #12674

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-01 21:20:13 +05:30
Michal Čihař
39f09e7aa9 Merge branch 'QA_4_6' 2016-10-25 10:31:26 +02:00
Michal Čihař
2c91327374 Merge pull request #12626 from madhuracj/bug12234 
Fix bug #12234 No page indicator in view
 2016-10-25 10:28:54 +02:00
Deven Bansod
7aad858dfb Merge branch 'QA_4_6' 
Conflicts:
	po/el.po
	po/ko.po
 2016-10-19 15:28:08 +05:30
Deven Bansod
1eac9c5ec2 Proper initialization of $_message variable according to value of $result 
While calling getDisplay, $_message should be an instance of PMA\libraries\Message.

Fix #12650

Also, spaces at the beginning of a table name are allowed if used inside backquotes.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-19 15:22:05 +05:30
Madhura Jayaratne
ba50cbb91c Fix bug #12234 No page indicator in view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-10-10 10:27:50 +11:00
Deven Bansod
4f023ac86a Allow for precision specification in TIMESTAMP datatype while editing/adding a column 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:36 +05:30
Deven Bansod
bd87fc0974 Merge branch 'QA_4_6' 2016-10-08 13:12:18 +05:30
Michal Čihař
6047e229b7 Merge branch 'QA_4_6' 2016-09-16 10:35:16 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Deven Bansod
37ff86315b Fix usage of backquote parameter in getNonGenerated func 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 16:31:59 +05:30
Deven Bansod
429c679f77 Fix tests, added testcase for Generated columns in moveCopy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 15:56:22 +05:30
Deven Bansod
4e534c977f Fix Export and Copy of Tables with Generated/Virtual columns 
We include only the non-generated columns insert using INSERT INTO .. SELECT .. FROM .. while copying data.

In Export too, we export the data of only the non-generated columns

Fix #12221
Fix #12518

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 14:18:26 +05:30
Michal Čihař
71336fb6cd Merge branch 'QA_4_6' 2016-08-25 14:33:57 +02:00
Michal Čihař
9882dcba3a Fixed editing of ENUM/SET/DECIMAL fields structure 
Fixes #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:33:21 +02:00
Michal Čihař
33348c5ed5 Allow to specify length of 0 
Issue #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:32:48 +02:00
Michal Čihař
be70f0c6bf Merge branches 'QA_4_6-security' and 'master' into master-security 2016-07-22 15:48:20 +02:00
Michal Čihař
28eb84ef43 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-22 15:48:09 +02:00
Michal Čihař
cd111e481a Merge branch 'QA_4_6' 2016-07-22 15:47:50 +02:00
Michal Čihař
99903101d9 Enfornce numeric field length when creating table 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 15:47:38 +02:00
Michal Čihař
24246115f5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 17:43:52 +02:00
Michal Čihař
7ef96c5cdc Correctly escape MySQL username in queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 17:42:45 +02:00
Michal Čihař
fac96d342f Share code for columns formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:24:22 +02:00
Michal Čihař
bdb1e7af4e Clarify return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:21:23 +02:00
Michal Čihař
3606276e56 Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:19:59 +02:00
Michal Čihař
2a9123fe10 Define visibility for public methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:18:00 +02:00
Michal Čihař
18c0786eae Improve addMessage calls 
- add call which accepts HTML markup
- use separator where applicable
- extend testcase to see HTML markup handling

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:25:33 +02:00
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:07:27 +02:00
Madhura Jayaratne
a3088fd8bf Fix #12116 Fulltext indexes are not copied when using copy database function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-22 11:32:44 +11:00
Michal Čihař
e1c9dec998 Merge commit '912f96114dc803404e2854ebb5796757a4eeedb6' 2016-01-05 08:21:32 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Deven Bansod
56e3c123a0 Merge branch 'QA_4_5' 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/vi.po
	test/classes/TableTest.php
 2015-12-27 11:04:56 +05:30
Madhura Jayaratne
36ddd9c670 Merge branch 'QA_4_5' 
Conflicts:
	libraries/Table.php
 2015-12-02 10:45:06 +11:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Marc Delisle
1861e9b775 Merge branch 'QA_4_5' 2015-10-19 09:12:50 -04:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
d1c6257136 Fix merge. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-06 22:01:39 +02:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00
Hugues Peccatte
21460a01c0 Merge branch 'master' into useNamespaces_master 2015-09-18 23:17:22 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:09:30 +02:00
Hugues Peccatte
b1038cfefa Merge branch 'master' into useNamespaces_master 2015-09-04 22:37:45 +02:00
Hugues Peccatte
984545832e Fix PMA_Table to Table rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
a7ea4cda5b Add missing namespaces. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +02:00