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

6382 Commits

Author SHA1 Message Date
Michal Čihař
192d303606 Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-03-02 11:23:11 +01:00
Michal Čihař
656809ac3b Error can possibly contain html chars and should be escaped 2012-03-02 11:21:30 +01:00
Marc Delisle
24e24b8c4e 3.5.0-rc1 release 2012-02-20 12:50:04 -05:00
Michal Čihař
efd57bbd1a Prevent creating copy of possibly huge array (bug #3489378) 2012-02-20 13:37:46 +01:00
Madhura Jayaratne
3fadd41b41 Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	libraries/common.lib.php
 2012-02-19 21:32:16 +05:30
Madhura Jayaratne
6cec91e805 libraries/common.lib.php might have not been loaded by the time PMA_isSerializable() is called. 2012-02-19 21:22:36 +05:30
Madhura Jayaratne
ff11bfbe64 Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	libraries/common.lib.php
 2012-02-18 17:25:38 +05:30
Madhura Jayaratne
f9b2f08f21 bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation 2012-02-18 17:17:01 +05:30
Madhura Jayaratne
48cbfe14ef Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-02-18 14:52:37 +05:30
Madhura Jayaratne
e14b73d23e Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	libraries/common.lib.php
 2012-02-18 14:51:23 +05:30
Madhura Jayaratne
0d1407f178 bug #3486970 [import] Exception on XML import 2012-02-18 14:43:05 +05:30
Madhura Jayaratne
a4183c6da2 bug #3482113 [edit] Column '0' not changeable 2012-02-18 12:32:31 +05:30
Piotr Przybylski
d3b1b9f9a2 Support for Drizzle IPV6 column type in Fremont 
Added SCHEMA function (synonym for DATABASE)
 2012-02-17 19:26:27 +01:00
Piotr Przybylski
ea4ebbeb8d Treat performance_schema as system schema only for MySQL, not for Drizzle 2012-02-17 19:26:26 +01:00
Michal Čihař
0934844ba2 Treat performance_schema as system schema 2012-02-16 15:57:19 +01:00
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +01:00
Michal Čihař
b0f4a09333 Use already detected scheme 2012-02-08 16:10:10 +01:00
Michal Čihař
40818833af Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-02-08 14:23:12 +01:00
Michal Čihař
b4296d6acb Escape in correct places to avoid double escaping sometimes 2012-02-08 14:22:39 +01:00
Michal Čihař
e33c665dc6 bug #3423717 [core] Improved detection of SSL connection 2012-02-08 11:58:05 +01:00
Michal Čihař
9bb5535199 Provide Show all button for reasonably small tables 2012-02-08 10:03:05 +01:00
Michal Čihař
8ec7e8587f Avoid undefined variable when showing all records 2012-02-08 10:03:05 +01:00
Madhura Jayaratne
68490d6ec4 Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	libraries/tcpdf/README.TXT
	libraries/tcpdf/encodings_maps.php
	libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
	libraries/tcpdf/fonts/dejavuserif.ctg.z
	libraries/tcpdf/fonts/dejavuserif.php
	libraries/tcpdf/fonts/dejavuserif.z
	libraries/tcpdf/fonts/dejavuserifb.ctg.z
	libraries/tcpdf/fonts/dejavuserifb.php
	libraries/tcpdf/fonts/dejavuserifb.z
	libraries/tcpdf/tcpdf.php
	libraries/tcpdf/unicode_data.php
 2012-01-29 21:51:20 +05:30
Madhura Jayaratne
478169d63e Merge branch 'MAINT_3_4_10' into QA_3_4 2012-01-29 21:39:58 +05:30
Madhura Jayaratne
6072137cdd TCPDF updated to version 5.9.145 2012-01-29 21:33:43 +05:30
Marc Delisle
52f60156cb Put back correct version in this branch (was lost during commit f196b4804d) 2012-01-28 04:06:37 -05:00
Marc Delisle
519024e05c Starting 3.6.0 2012-01-25 05:19:15 -05:00
Marc Delisle
badc93d5d4 Maybe 3.4.11 ? 2012-01-24 12:28:06 -05:00
Marc Delisle
6d58b78a32 3.4.10-rc1 2012-01-24 12:25:51 -05:00
Yuichiro
7d0a3caa42 patch #3477270 Use pgettext for trigger action time 2012-01-22 04:33:33 -05:00
Yuichiro
786358531b patch #3475424 [import] Fixed CSV escape for the import 2012-01-22 04:24:03 -05:00
Yuichiro
82aa0b7dc1 patch #3472899 [export] Fixed CSV escape for the export 2012-01-22 04:09:29 -05:00
Madhura Jayaratne
f5ffad3583 Merge branch 'QA_3_4' 
Conflicts:
	libraries/tbl_replace_fields.inc.php
 2012-01-22 12:10:44 +05:30
Madhura Jayaratne
3c7b233d9c bug #3477063 [edit] Missing set fields and values in generated INSERT query 2012-01-22 11:55:28 +05:30
Madhura Jayaratne
5da1aaa0fe To avoid warnings when strlen() is called on the array containing chosen values for set field 2012-01-22 11:52:23 +05:30
Rouslan Placella
9dd32a98bf Fixed bug 3472023 - Displaying procedure output 2012-01-15 17:04:10 +00:00
Yuichiro
f324012ec1 patch #3473635 Join messages 2012-01-15 06:18:29 -05:00
Marc Delisle
13d741e178 onClick should be onclick 2012-01-08 08:24:43 -05:00
Marc Delisle
0b70c272b4 Incorrect XHTML 2012-01-08 08:21:20 -05:00
Marc Delisle
02fb282694 Clarify parameter name 2012-01-08 07:39:20 -05:00
Marc Delisle
dcc9b2c71f bug #3411038 Zoom search and inserting foreign values 2012-01-08 07:26:06 -05:00
Marc Delisle
81d27b3593 RetainQueryBox in setup and user prefs 2012-01-07 07:38:00 -05:00
Marc Delisle
02a736b479 This control has no effect when in the distinct query window 2012-01-07 07:20:02 -05:00
Marc Delisle
e5323864b7 Make message and field name more consistent with existing interface (query box) 2012-01-07 07:05:25 -05:00
Gareth Pursehouse
73edcc1511 patch #3303195 [interface] Checkbox to have SQL input remain 2012-01-07 07:00:56 -05:00
Marc Delisle
8d5434fa98 going to 3.5.0-beta1-dev 2012-01-06 07:04:23 -05:00
Marc Delisle
1a98c838e6 3.5.0-alpha1 2012-01-06 05:53:16 -05:00
Yuichiro
e89874ebe1 Add missing percent 2012-01-05 16:17:57 +01:00
Marc Delisle
fc928ad7b6 bug #3093145 [display] Page through rows returned from a view 2012-01-05 07:57:12 -05:00
Dieter Adriaenssens
8078441519 typo 2011-12-30 19:53:11 +01:00