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

12678 Commits

Author SHA1 Message Date
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
Rakesh Kumar
8415dd4d35 fix bug #4659: trim white spaces 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2014-12-21 00:55:20 +05:30
Marc Delisle
5429d91ce1 bug ['Error_Handler']['display'] no longer necessary 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-20 13:32:34 -05:00
Marc Delisle
8f475aebcb bug #4656 Some error popups fade away too quickly 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-19 08:04:23 -05:00
Marc Delisle
4ef98d5a82 Adjust headers when favorite tables are disabled 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-17 10:00:49 -05:00
Marc Delisle
266f4c7bb6 Bug Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-16 13:32:52 -05:00
Martin Riedl
fa4421ed38 Fix initial replication configuration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-16 09:54:46 -05:00
Madhura Jayaratne
1396b55cec bug #4649 Attributes field size smaller than others 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 18:47:22 +05:30
Madhura Jayaratne
33c819b8b4 Remove token from JS file requests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 13:13:52 +05:30
Marc Delisle
c2e308cb1e bug #4647 Can't disable Favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 13:30:27 -05:00
Marc Delisle
38f0969410 bug The "Recently used tables" setting should be with Nav panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 13:15:49 -05:00
Marc Delisle
cca317168b 4.3.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 08:36:42 -05:00
Madhura Jayaratne
eb69c015ac #4644 Error when browsing tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-12 15:26:00 +05:30
Marc Delisle
9555a21a3d Another instance of Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:53:20 -05:00
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Madhura Jayaratne
4f1ce1004e bug #4638 Default Export Method setting broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 15:57:19 +05:30
Madhura Jayaratne
cb40e81e9c 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-11 13:21:31 +05:30
Madhura Jayaratne
077916c82a bug #3794 failure to handle repeating empty columns when importing ODS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:18:28 +05:30
Nisarg Jhaveri
7a1c989b43 Fix bug 4635 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-10 07:58:58 -05:00
Madhura Jayaratne
f39a4e10cd bug #4633 Wrong parameter in fetchValue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 14:35:14 +05:30
Madhura Jayaratne
7ee1af4fc6 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-10 12:41:22 +05:30
Madhura Jayaratne
ce2474f108 bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query. 
Url may not necessarily have a query part

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 12:39:37 +05:30
Marc Delisle
7deba11168 Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:05:14 -05:00
Madhura Jayaratne
55488bf86f bug #4631 Server selector submits two server parameter values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 16:26:46 +05:30
Madhura Jayaratne
3eb3ce396b bug #4628 PHP error while exporting schema as PDF 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 12:36:52 +05:30
Marc Delisle
2c19d17ce1 4.3.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 12:26:01 -05:00
Madhura Jayaratne
2d18ea2d4c Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-08 20:40:12 +05:30
Madhura Jayaratne
aab6b291a9 Add comment explaining why strlen is used in place of mb_strlen 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 20:37:36 +05:30
Marc Delisle
18477cc467 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 07:53:20 -05:00
Madhura Jayaratne
d475b3444c bug #4617 UI issues with sortable tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 17:56:15 +05:30
Madhura Jayaratne
b69bb37361 bug #4627 "file_get_contents(examples/create_tables.sql): failed to open stream" after update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 14:12:03 +05:30
Madhura Jayaratne
6f1b4fa259 A better fix for bug #4625 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 12:56:11 +05:30
Madhura Jayaratne
775436f70f bug #4625 "Insufficient space to save the file" on export SQL to file on server 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 12:46:46 +05:30
Hugues Peccatte
d4c221160a Fix #4619 SELECT LENGTH(field) FROM does not sort 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-07 16:28:00 +01:00
Robert Scheck
d9468e3fff Bug #4623 Incomplete PHP OpenSSL support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:37:15 -05:00