gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,583 Commits 12 Branches 481 Tags 2.4 GiB
324e4dbe73
Commit Graph

8957 Commits

Author SHA1 Message Date
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
 2013-04-25 20:54:51 +05:30
Madhura Jayaratne
5ff9e989b7 Merge pull request #267 from kasunchathuranga/Bug3879 
Fix bug #3879 Import broken for CSV using LOAD DATA
 2013-04-25 08:14:45 -07:00
Michal Čihař
04063608cb Use format string instead of concatenation 2013-04-25 14:42:45 +02:00
Michal Čihař
49a58c54d3 Consitent parameters naming 
Use same names in preferences and error messages as in export page.
 2013-04-25 14:38:41 +02:00
Michal Čihař
5954fe55a8 Consistent usage of colon on export pages 
All other export formats include colon in text fields description.
 2013-04-25 14:33:58 +02:00
Michal Čihař
62035e1551 Forgotten printf refactoring 2013-04-25 14:30:00 +02:00
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate 
In some languages this makes difference in translating, so it's better
to give translators full context.
 2013-04-25 14:22:31 +02:00
Marc Delisle
5a383c5be1 4.0.1-dev 2013-04-25 06:45:50 -04:00
Marc Delisle
303c0aaa5d Merge branch 'QA_4_0' 2013-04-24 14:42:13 -04:00
Marc Delisle
ac65210a28 Typo in input field name 2013-04-24 14:41:57 -04:00
Marc Delisle
b50aabb0e3 4.0.0-rc3 release 2013-04-24 09:02:39 -04:00
Marc Delisle
849eeb4519 Fix merge conflicts 2013-04-24 08:58:07 -04:00
Marc Delisle
28f74e7c29 Security: block another case of remote execution vulnerability 2013-04-23 16:16:13 -04:00
Marc Delisle
1cba93204b Prevent null-byte injection in preg_replace() 2013-04-23 11:46:53 -04:00
Marc Delisle
500657fd35 - port security commit (unsafe usage of preg_replace()) from the 3.5 
branch
- make the feature work (missing globalization of required $_POST params
 2013-04-23 11:44:26 -04:00
Michal Čihař
4d5558f134 Merge commit 'f1543b6b486a5b955d4bac3e02acb3b101f77a79' 2013-04-23 14:27:12 +02:00
fliespl
f1543b6b48 cast $pos variable when loading columns by ajax with disableIS = false (badly formatted query fails) 2013-04-23 14:26:18 +02:00
Michal Čihař
539646d7c0 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-22 14:07:15 +02:00
Michal Čihař
5b73bf9788 Fix generating links to docs 
This makes correct links to docs when run from setup.
See bug #3886 and gh issue #279.
 2013-04-22 14:05:40 +02:00
Michal Čihař
bee4a69a7b Merge remote-tracking branch 'origin/QA_4_0' 2013-04-22 14:04:02 +02:00
Kasun Chathuranga
9b9772c1fc Fix bug #3886 Documentation links broken in setup 2013-04-21 00:58:21 +05:30
Marc Delisle
eae95b4865 Merge branch 'QA_4_0' 2013-04-20 10:04:55 -04:00
Spun Nakandala
a4cd76bff4 Fixed Bug 3884 Ajax navigation not working with IS enabled (only on first click) 2013-04-20 00:39:34 +05:30
Kasun Chathuranga
edbe925d8a Minimize code duplication by pushing most of the common code to abstract parent class's setProperties() method 2013-04-19 23:00:22 +05:30
Kasun Chathuranga
175cb7b0ae Fix format specific options that were missing from ImportLdi plugin. Common code pulled out to AbstractImportCsv.class.php. 2013-04-18 22:44:49 +05:30
Kasun Chathuranga
4477494216 Importing CSV was also broken 2013-04-17 23:25:53 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Michal Čihař
cf3b086e7e Various coding style improvements 2013-04-16 13:29:03 +02:00
Marc Delisle
f105e8fcba 4.0.0-rc2 2013-04-15 16:32:21 -04:00
Marc Delisle
83a181ea01 Merge branch 'QA_4_0' 2013-04-15 16:26:27 -04:00
J.M
dfdee264c3 Fix bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM 2013-04-15 16:25:43 -04:00
Marc Delisle
ae7e542a51 Fix merge conflict 2013-04-15 12:47:19 -04:00
Michal Čihař
a7b1e909fd Merge pull request #241 from ayushchd/issue_https 
Fixed config tests and static variable issue
 2013-04-15 02:38:57 -07:00
Marc Delisle
ee09f98f73 Forgotten in refactoring 2013-04-14 19:21:35 -04:00
Madhura Jayaratne
b09b612579 Merge branch 'QA_4_0' 2013-04-14 23:39:48 +05:30
Madhura Jayaratne
818167ad03 Merge pull request #247 from madhuracj/CSP 
Allow loading map tiles when HTTPS is not used
 2013-04-14 11:04:22 -07:00
Marc Delisle
32cd9478d0 Merge branch 'QA_4_0' 2013-04-14 13:03:34 -04:00
Marc Delisle
0dbc20d735 Fix merge conflict 2013-04-14 13:01:55 -04:00
xmujay
d81ebdb847 refactor display_export.lib.php 2013-04-14 23:05:18 +08:00
J.M
c149391909 Merge remote-tracking branch 'origin/QA_4_0' into master 2013-04-14 15:57:20 +02:00
J.M
1e1354faca Fix spacing in table operations, Alter table order box 2013-04-14 15:46:35 +02:00
J.M
f1513b2678 Fix bug #3873 Can't copy table to target database if table exists there 2013-04-14 15:40:29 +02:00
J.M
050d6d31aa Fix bug #3874 [export] No preselected option when exporting table 2013-04-14 14:46:00 +02:00
Kasun Chathuranga
1a459f3575 Fix incorrect listing of records from to count 2013-04-13 23:19:49 +05:30
Madhura Jayaratne
f9859a013c Revert 0862f0a1ee. This was suppose to be a part of the pull request 247, however erroneously merged to master. Hence reverting. 2013-04-13 18:34:02 +05:30
Madhura Jayaratne
637be71f0c Allow loading map tiles when HTTPS is not used 2013-04-13 17:23:35 +05:30
Madhura Jayaratne
c833ec46fe Merge branch 'QA_4_0' 
Conflicts:
	po/ko.po
 2013-04-13 17:17:47 +05:30
Madhura Jayaratne
14feb9ede5 Remove Osmarender layer as it is no longer maintained 2013-04-13 17:14:05 +05:30
Madhura Jayaratne
0862f0a1ee Allow loading map tiles when HTTPS is not used 2013-04-13 17:06:31 +05:30
Madhura Jayaratne
ea09916fe5 Wrap more long lines 2013-04-12 22:47:29 +05:30