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

104279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marc Delisle
8ac0aaf5e8 Merge commit 'a81ac37' 2015-12-25 14:39:46 -05:00
Weblate
9de6ee383c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-25 20:35:04 +01:00
Robin van der Vliet
879d843588 Translated using Weblate (Frisian) 
Currently translated at 19.4% (623 of 3210 strings)

[CI skip]
 2015-12-25 20:35:02 +01:00
Robin van der Vliet
7171b0529f Translated using Weblate (Esperanto) 
Currently translated at 11.3% (363 of 3210 strings)

[CI skip]
 2015-12-25 20:35:02 +01:00
Marc Delisle
4cd3597bda Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:34:50 -05:00
Marc Delisle
09c3375ec2 Merge commit 'a81ac37' into QA_4_5 2015-12-25 14:34:01 -05:00
Marc Delisle
63989d8666 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:33:16 -05:00
Robin van der Vliet
c9b35f480f Translated using Weblate (Esperanto) 
Currently translated at 2.5% (81 of 3210 strings)

[CI skip]
 2015-12-24 22:56:23 +01:00
Robin van der Vliet
e1292272d2 Translated using Weblate (Esperanto) 
Currently translated at 2.5% (81 of 3215 strings)

[CI skip]
 2015-12-24 22:50:57 +01:00
Michal Čihař
5de5dc8463 Simplify detection of current script 
Fixes #11754

Signed-off-by: Michal Čihař <michal@cihar.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-24 08:12:56 -05:00
Marc Delisle
9c849eced6 Fix indenting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-24 06:17:01 -05:00
Marc Delisle
f014c53de2 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-24 06:16:16 -05:00
Marc Delisle
7bf4546cfa Merge branch 'QA_4_5' 2015-12-23 08:02:34 -05:00
Marc Delisle
48b5ed787f Merge commit '2004c90' 2015-12-23 08:02:28 -05:00
Marc Delisle
bd77d385da 4.5.3 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-23 08:01:57 -05:00
Marc Delisle
a81ac373c8 4.5.3 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-23 08:01:13 -05:00
Weblate
2004c90aeb Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-23 09:56:29 +01:00
Martin Lacina
983c36fd42 Translated using Weblate (Slovak) 
Currently translated at 83.8% (2690 of 3210 strings)

[CI skip]
 2015-12-23 09:56:29 +01:00
Michal Čihař
aa3f719ad1 Merge branch 'QA_4_5' 2015-12-23 09:56:08 +01:00
Michal Čihař
777a431e3d Merge branch 'MAINT_4_5_3' into QA_4_5 2015-12-23 09:55:56 +01:00
Michal Čihař
16d9e80671 Fix possible undefined variables in table operations 
Fixes #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-23 09:55:36 +01:00
Michal Čihař
d0c79e0294 Merge remote-tracking branch 'origin/MAINT_4_5_2' into QA_4_5 2015-12-23 09:53:09 +01:00
Marc Delisle
537951b043 Unset applied to the variables of a foreach loop as useless 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-22 05:08:39 -05:00
Michal Čihař
7dd415776a Remove unused parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-22 09:17:51 +01:00