gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,303 Commits 12 Branches 481 Tags 2.4 GiB
63b2519ae6
Commit Graph

104303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
63b2519ae6 Merge commit 'd0532b1c955eed4daef6fc5bca2f1120c4be8340' 2015-12-28 10:06:59 +01:00
Weblate
5fb0931e75 Merge remote-tracking branch 'origin/master' 2015-12-28 09:20:38 +01:00
Weblate
d0532b1c95 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-28 09:20:38 +01:00
João Machaqueiro
694e1e61bd Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1734 of 3217 strings)

[CI skip]
 2015-12-28 09:20:37 +01:00
João Machaqueiro
003f01f885 Translated using Weblate (Portuguese) 
Currently translated at 54.7% (1756 of 3210 strings)

[CI skip]
 2015-12-28 09:20:37 +01:00
신흥재
4ba1142d33 Translated using Weblate (Korean) 
Currently translated at 77.3% (2488 of 3217 strings)

[CI skip]
 2015-12-28 09:20:36 +01:00
신흥재
97a40d55aa Translated using Weblate (Korean) 
Currently translated at 78.4% (2519 of 3210 strings)

[CI skip]
 2015-12-28 09:20:36 +01:00
Giovanni Sora
f643fb97e1 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2338 of 3217 strings)

[CI skip]
 2015-12-28 09:20:36 +01:00
Michal Čihař
bcd1d838b4 Merge branch 'QA_4_5' 2015-12-28 09:20:12 +01:00
Michal Čihař
6768378f71 Properly handle errors in upacking zip archive 
When zip_open fails, we do not have proper handle to use for zip_close.

Fixes #11784

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 09:19:28 +01:00
Kristjan Räts
0c01957810 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-28 08:45:32 +01:00
dingo thirteen
91961cef3b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-27 21:05:14 +01:00
Ann + J.M
35052d28b0 Translated using Weblate (German) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-27 20:23:58 +01:00
Domen
d6735d143f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-27 19:54:01 +01:00
Burak Yavuz
27be93ab6d Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-27 19:41:09 +01:00
Παναγιώτης Παπάζογλου
e388552aa9 Translated using Weblate (Greek) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-27 17:41:17 +01:00
Marc Delisle
20c8853a1e Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-27 07:41:47 -05:00
Marc Delisle
c079df0ff3 Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-27 07:40:23 -05:00
Marc Delisle
b1348b101c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-27 07:39:38 -05:00
Marc Delisle
774404626d Merge pull request #11782 from Achilles-96/Issue-11538 
Fixes #11538
 2015-12-27 07:37:55 -05:00
Marc Delisle
e5306b495a Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-27 07:21:09 -05:00
Michal Čihař
43aa000bdd Merge branch 'QA_4_5' 2015-12-27 10:23:48 +01:00
Michal Čihař
218f13d8e0 Avoid syntax error in javascript messages 
If max_input_vars is set to invalid value (eg. 1000M), the generated
javascript is invalid. We fix this by forcing the value to be integer,
what should do the same thing as PHP is doing when parsing this.

Fixes #11783

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-27 10:21:35 +01:00
Michal Čihař
d67066b9cc Add test for PMA_getJsValue with string 
Issue #11783

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-27 10:15:31 +01:00
Michal Čihař
8358d8c939 Merge branch 'QA_4_5' 2015-12-27 10:01:04 +01:00
Michal Čihař
541df24815 Merge remote-tracking branch 'origin/MAINT_4_5_3' into QA_4_5 2015-12-27 10:00:46 +01:00
Achilles-96
bd2dcfcdc7 Fixes #11538 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-27 11:37:34 +05:30
Deven Bansod
56e3c123a0 Merge branch 'QA_4_5' 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/vi.po
	test/classes/TableTest.php
 2015-12-27 11:04:56 +05:30
Deven Bansod
32c6726d68 ChangeLog entry for issue #11777 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-27 10:57:40 +05:30
Deven Bansod
8bd97563b4 Merge pull request #11779 from devenbansod/fix_error_in_11757_correction 
Fix #11777: While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
 2015-12-27 10:55:40 +05:30
Marc Delisle
043f34b51b Merge branch 'QA_4_5' 2015-12-26 09:10:01 -05:00
Weblate
f7f3388653 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-26 15:09:52 +01:00
Thành Phạm
74d27e4fe1 Translated using Weblate (Vietnamese) 
Currently translated at 2.3% (76 of 3210 strings)

[CI skip]
 2015-12-26 15:09:52 +01:00
Marc Delisle
2ae01873ee Table list not saved in db QBE bookmarked search 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-26 09:09:42 -05:00
Weblate
fe0534e322 Merge remote-tracking branch 'origin/master' 2015-12-26 14:41:48 +01:00
Thành Phạm
e4699f9f5c Translated using Weblate (Vietnamese) 
Currently translated at 2.3% (76 of 3215 strings)

[CI skip]
 2015-12-26 14:41:48 +01:00
Marc Delisle
9b1d29d9cf Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-26 08:38:27 -05:00
Marc Delisle
e501e50f08 Fix incorrect error condition 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-26 08:37:17 -05:00
Deven Bansod
28a5a2693b Fix error in commit : a4f02ca 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-26 13:17:16 +05:30
Marc Delisle
d89a6bda4c 4.5.3.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:51:01 -05:00
Marc Delisle
8ff09ad52e Merge branch 'QA_4_5' 2015-12-25 14:48:56 -05:00
Marc Delisle
73544de531 Merge branch 'MAINT_4_5_3' into QA_4_5 2015-12-25 14:48:04 -05:00
Marc Delisle
c4d649325b [Security] Path disclosure, see PMASA-2015-6 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:46:01 -05:00
Weblate
dc1769ace8 Merge remote-tracking branch 'origin/master' 2015-12-25 20:41:45 +01:00
Robin van der Vliet
3881abeb2a Translated using Weblate (Frisian) 
Currently translated at 19.3% (621 of 3215 strings)

[CI skip]
 2015-12-25 20:41:43 +01:00
Robin van der Vliet
32a369a00c Translated using Weblate (Esperanto) 
Currently translated at 11.1% (358 of 3215 strings)

[CI skip]
 2015-12-25 20:41:43 +01:00
Marc Delisle
6e06b57fdc Merge commit '9de6ee3' 2015-12-25 14:41:26 -05:00
Marc Delisle
1d1bf9a7af Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:41:01 -05:00
Marc Delisle
713ba61d5c Merge commit 'c9b35f4' 2015-12-25 14:40:06 -05:00
Marc Delisle
cb3ecd467a Merge commit '5de5dc8' 2015-12-25 14:39:55 -05:00