gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,572 Commits 12 Branches 481 Tags 2.4 GiB
304fb2b645
Commit Graph

92572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
304fb2b645 Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:09:12 -04:00
Marc Delisle
c1a3f85fbd [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
 2014-10-01 08:01:00 -04:00
Marc Delisle
7dc42d93af 4.2.9 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-20 06:56:30 -04:00
Weblate
8601ede46b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-20 12:41:06 +02:00
Kyeong Su Shin
9cd65f3db5 Translated using Weblate (Korean) 
Currently translated at 84.6% (2343 of 2768)

[ci skip]
 2014-09-20 12:41:03 +02:00
Marc Delisle
3085e8f4ab 4.2.8.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-20 06:40:29 -04:00
Dean Moncaster
95911ff20f Sticky column headers were getting wrongly aligned, http://stackoverflow.com/questions/24635110/phpmyadmin-column-headers-move-in-table-when-you-scroll 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-09-18 17:22:18 +05:30
Marc Delisle
070a9e1d62 bug tbl_structure.js "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 09:15:05 -04:00
Marc Delisle
a10d5e15f6 bug ajax.js responseHandler: another "cannot read property" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-17 08:26:39 -04:00
Marc Delisle
35dd99c499 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-09-15 08:02:08 -04:00
Marc Delisle
6af812ee44 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 08:01:57 -04:00
Weblate
26b6ba50a6 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-15 14:00:58 +02:00
Kyeong Su Shin
0df1d4b837 Translated using Weblate (Korean) 
Currently translated at 84.6% (2342 of 2768)

[ci skip]
 2014-09-15 14:00:55 +02:00
Marc Delisle
51f2b5f319 Merge pull request #1357 from Tithugues/b4523_q42 
Fix #4523: tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value
 2014-09-15 08:00:41 -04:00
Hugues Peccatte
41c02512c7 Code style improvements. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 20:47:24 +02:00
Hugues Peccatte
fbf2e028f5 Fix #4523 insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 20:45:07 +02:00
Weblate
e38891f07a Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-13 16:35:12 +02:00
Kristjan Rรคts
bfc4c21b1f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-09-13 16:35:09 +02:00
Marc Delisle
f2be36ae80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:33:32 -04:00
Marc Delisle
c0548df2f9 Merge commit '01c553a' into QA_4_2 2014-09-13 10:31:56 -04:00
Marc Delisle
33b39f9f1d bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:30:47 -04:00
Marc Delisle
1ef714febe bug #4529 Undefined index: pos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-11 08:12:06 -04:00
Hugues Peccatte
87b1cd1a2d Merge pull request #1354 from Tithugues/b4524_q42 
Fix #4524: Add missing 0 initial on the "Users overview".
 2014-09-07 17:06:16 +02:00
Hugues Peccatte
451ece01f4 Fix #4524: Add missing 0 initial on the "Users overview". 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 15:17:27 +02:00
Weblate
e1664a35e2 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-05 18:39:05 +02:00
Alex Smirnov
6e34c029fd Translated using Weblate (Russian) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-09-05 18:39:02 +02:00
Marc Delisle
efbf606a4d bug sql.js: str is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-05 12:38:04 -04:00
Marc Delisle
2a34539a48 bug ajax.js responseHandler: cannot read property of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 11:39:07 -04:00
Marc Delisle
d56af4f911 4.2.8 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:54:18 -04:00
Marc Delisle
01c553a795 4.2.8 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:53:29 -04:00
Marc Delisle
b0d3056de9 4.2.9-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:49:12 -04:00
Marc Delisle
fee447fae8 bug in functions.js: Cannot read property 'replace' of undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:22:14 -04:00
Atul Pratap Singh
6648319c62 Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-08-30 13:32:40 +05:30
Marc Delisle
5cdd9f4792 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 12:02:53 -04:00
Marc Delisle
54f80bfd7f Merge pull request #1347 from ashutoshdhundhara/bug_4527 
Bug #4527: Importing ODS files with column names having trailing spaces fails.
 2014-08-29 12:02:07 -04:00
Ashutosh Dhundhara
5f2adcb9ca Bug #4527: Importing ODS files with column names having trailing spaces fails. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-29 20:39:34 +05:30
Marc Delisle
d6cf9ebaaa bug in server_privileges.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 09:08:02 -04:00
Atul Pratap Singh
7e5026cde4 Fix bug#4413 Navigation Error in Nav Tree for Search Results Past the First Page 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-08-29 14:19:38 +05:30
Marc Delisle
74ae4a2938 Merge pull request #1346 from smita786/QA_4_2 
update unit test needed after fixing bug 4487
 2014-08-28 15:43:05 -04:00
Smita Kumari
3b479f52f9 fix unit test 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 22:48:35 +05:30
Weblate
5c118629c0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-28 18:35:49 +02:00
Alex Smirnov
ed284bd574 Translated using Weblate (Russian) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-08-28 18:35:45 +02:00
Marc Delisle
14d9437c04 Merge pull request #1345 from smita786/QA_4_2 
update bug fix #4487
 2014-08-28 12:35:34 -04:00
Smita Kumari
fed466498e update bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 21:12:04 +05:30
Marc Delisle
3a9e2bbf65 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-27 12:54:26 -04:00
Weblate
d789ee4bbe Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-27 18:52:24 +02:00
Chien Wei Lin
9776abce46 Translated using Weblate (Traditional Chinese) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-08-27 18:52:21 +02:00
Marc Delisle
ebf07e8131 Merge pull request #1344 from smita786/QA_4_2 
fix bug #4487
 2014-08-27 12:52:14 -04:00
Smita Kumari
83e90ae1a0 bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-27 19:12:27 +05:30
Weblate
58e4568277 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-26 13:55:01 +02:00