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

12712 Commits

Author SHA1 Message Date
Marc Delisle
41e297aa60 4.3.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-07 12:23:46 -05:00
Madhura Jayaratne
e0de22d806 Do not try to auto configure pma tables if PMA_MINIMUM_COMMON is defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 09:23:28 -05:00
Madhura Jayaratne
5691cdb880 bug #4691 Do not include console when no server is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:26:38 +05:30
Madhura Jayaratne
99aad2c118 bug #4685 Call to a member function isUserType() on a non-object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:49:33 +05:30
Marc Delisle
235d5f47f8 bug #4689 Setup tool creates "pma__favorites" incorrectly 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-06 14:17:12 -05:00
Madhura Jayaratne
a65e7fb0fc Undefined index notices while configuring recent and favorite tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 13:14:46 +05:30
Marc Delisle
7562aadc40 4.3.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:15:22 -05:00
Marc Delisle
964881b40d Merge remote-tracking branch 'madhuracj/zeroconf' into QA_4_3 2015-01-04 07:32:31 -05:00
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Marc Delisle
cf8bed2e3e Incorrect parameter passed to function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-03 07:30:57 -05:00
Madhura Jayaratne
62631f77bf Simplify checking for empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 20:57:51 +05:30
Marc Delisle
d95356e1dd bug #4655 Undefined index: collation_connection (second patch) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-02 09:32:19 -05:00
Madhura Jayaratne
31a1b7396c Saving table UI prefs were failing due to errors in the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 19:40:45 +05:30
Madhura Jayaratne
9bc80b7c84 Do not save the configuration table name statically 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 19:40:07 +05:30
Madhura Jayaratne
a7db400145 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:48:05 +05:30
Madhura Jayaratne
6b85f72604 bug #4683 Relational data is not properly updated on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 15:35:42 +05:30
Madhura Jayaratne
2947c166a1 Do not read SQL file until it is really required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 11:11:06 +05:30
Madhura Jayaratne
eee442e4a7 Update another tracking query and its corresponding unit test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 10:27:47 +05:30
Madhura Jayaratne
09fff10681 Fix tracking query and related test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 10:21:10 +05:30
Madhura Jayaratne
e75d4ec8b4 Merge branch 'QA_4_3' into zeroconf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:57:25 +05:30
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:49:03 +05:30
Marc Delisle
c69cf0b74d Based on http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci, changed the default connection collation 
to improve sort accuracy.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 10:42:44 -05:00
Marc Delisle
69443f623d Clarify messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-01 08:20:53 -05:00
Madhura Jayaratne
3bd84ee7d3 bug #4681 'Central columns table' field in setup does not have a description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:14:05 +05:30
Madhura Jayaratne
8999bc6c65 bug #4680 Number of favorite table are not configurable in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-01 11:00:48 +05:30
Madhura Jayaratne
9d2880a1c5 bug #4679 Setup does not allow providing a name for favorites table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 17:57:29 +05:30
Madhura Jayaratne
19583d8013 bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 17:18:08 +05:30
Madhura Jayaratne
44647b7eb6 bug #4677 Advanced feature checker does not check for favorite tables feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-31 16:09:49 +05:30
Marc Delisle
e30d15d3b8 Bug in Auto-configuration: tables were not created automatically 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-30 11:46:48 -05:00
Marc Delisle
bbebf89ad2 4.3.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 07:06:01 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-26 08:29:09 -05:00
Marc Delisle
462428570e bug #4658 Illegal string offset (Data_length, Index_length) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 07:47:20 -05:00
Rakesh Kumar
ed32527de0 fix bug #4672 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2014-12-24 23:01:29 +05:30
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
aaa6b9d4d9 Merge branch 'QA_4_3' into Bug4642 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 12:03:25 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
7d492ba011 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:15:44 +05:30
Madhura Jayaratne
c95dc6d6cb Use default separator of space between messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:11:58 +05:30
Madhura Jayaratne
ab1c456bb1 bug #4668 Remove from central columns error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:06:52 +05:30
Atul Pratap Singh
b9cb88c5fc Merge pull request #1436 from smita786/QA_4_3 
fix bug #4665
 2014-12-23 18:55:27 +05:30
Smita Kumari
af33e8a144 fix bug #4665 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-12-23 18:38:46 +05:30
Marc Delisle
ac6657c1fd Merge pull request #1435 from madhuracj/Bug4663 
#4663 Export missing back ticks for order table name
 2014-12-23 08:02:04 -05:00
Madhura Jayaratne
c445794bde bug #4666 Undefined indexes in table stucture print view of a view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 16:50:47 +05:30
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:03:23 +05:30
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 12:53:12 +05:30
Madhura Jayaratne
bac38f3ef6 bug #4653 Always connection error was shown, on /setup at tab "configuration storage" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 14:58:58 +05:30
Hugues Peccatte
2dcb1c9b0a Fix #4645 Import of export created with mysqldump 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-21 22:57:25 +01:00
Marc Delisle
3960df34bc 4.3.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:31:09 -05:00
Marc Delisle
c64b77981e Merge pull request #1431 from rakeshkaundilya/QA_4_3 
fix bug #4659: trim white spaces
 2014-12-20 15:00:40 -05:00