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

92327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
e0933c8cba Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:03:44 -04:00
Weblate
90a8a74afa Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-25 14:08:49 +02:00
Giovanni Sora
18370fc63e Translated using Weblate (Interlingua) 
Currently translated at 54.5% (1512 of 2770)
 2014-06-25 14:08:46 +02:00
Michal Čihař
e6f6dab3b0 Fixed cookie based login for installations without mcrypt 
bug #4469

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:08:03 +02:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 14:24:57 +05:30
Weblate
c81e1acd48 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-25 09:24:42 +02:00
Sevdimali İsa
212195a253 Translated using Weblate (Azerbaijani) 
Currently translated at 40.0% (1108 of 2770)
 2014-06-25 09:24:38 +02:00
Chirayu Chiripal
48b0bfd259 no need to disable contructor of SplObjectStorage 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 09:24:19 +02:00
Weblate
31b439366f Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-23 17:56:34 +02:00
Thiago Sabaia
0c60471ae5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (2768 of 2770)
 2014-06-23 17:56:30 +02:00
Kristjan Räts
e1621b890f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-23 17:56:28 +02:00
Sevdimali İsa
26dab85f44 Translated using Weblate (Azerbaijani) 
Currently translated at 38.4% (1066 of 2770)
 2014-06-23 17:56:26 +02:00
Marc Delisle
2a807fe073 Merge pull request #1248 from Tithugues/QA_4_2_b4463 
Add missing include. (bug #4463)
 2014-06-23 11:56:06 -04:00
Hugues Peccatte
1fb1093d0d Add missing include. (bug #4463) 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 22:51:13 +02:00
Weblate
cee3010288 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-22 18:23:35 +02:00
Sevdimali İsa
1ac64c7d75 Translated using Weblate (Azerbaijani) 
Currently translated at 31.0% (860 of 2770)
 2014-06-22 18:23:31 +02:00
Ann + J.M
46091ff2e2 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 17:28:43 +02:00
Hugues Peccatte
8b5ea8869d Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 17:00:58 +02:00
Hugues Peccatte
2a5430888d Merge pull request #1247 from Tithugues/QA_4_2_fixEmptySQL 
Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug #4470)
 2014-06-22 16:50:31 +02:00
Ann + J.M
1fd8fde4ca Fix failing tests 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:49:17 +02:00
Weblate
6fdf5e6551 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-22 16:35:36 +02:00
Richard G. Nielsen
82cd44a988 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 61.5% (1705 of 2770)
 2014-06-22 16:35:33 +02:00
Yungu Kim
698e790f02 Translated using Weblate (Korean) 
Currently translated at 82.1% (2276 of 2770)
 2014-06-22 16:35:31 +02:00
Sevdimali İsa
72439c27df Translated using Weblate (Azerbaijani) 
Currently translated at 29.7% (824 of 2770)
 2014-06-22 16:35:28 +02:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Marc Delisle
da732cc88b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-21 07:22:36 -04:00
Hugues Peccatte
876d029549 Fix error when clicking 'Go' and having an empty textarea in SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-20 23:22:42 +02:00
Marc Delisle
a30405fe0b bug #4467 shell_exec() has been disabled for security reasons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 15:39:09 -04:00
Marc Delisle
f1253cf31f 4.2.4 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:52:26 -04:00
Marc Delisle
aea604f850 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:40:11 -04:00
Marc Delisle
782fe7a1e5 Merge commit 'd4f754c' into QA_4_2 2014-06-20 12:38:43 -04:00
Marc Delisle
aebfcfdc9f 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:47:51 -04:00
Ann + J.M
c68ed5c51b Add Changelog section for 4.2.4.0, list bugs 4464, 4465 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 15:26:40 +02:00
Ann + J.M
d4f754c937 Fix XSS in Hide navigation items feature 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 12:57:59 +02:00
Ann + J.M
d18a2dd9fa Fix XSS in PMA_RecentFavoriteTable::getHtmlList() 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 12:52:52 +02:00
Weblate
c01de87ef6 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-18 18:06:11 +02:00
Rui Ralha
8b93864670 Translated using Weblate (Portuguese) 
Currently translated at 63.2% (1751 of 2770)
 2014-06-18 18:06:08 +02:00
Giovanni Sora
7b2d66f08c Translated using Weblate (Interlingua) 
Currently translated at 52.0% (1441 of 2770)
 2014-06-18 18:06:06 +02:00
cherbib mehdi
eeed348ddc Translated using Weblate (Arabic) 
Currently translated at 41.0% (1138 of 2770)
 2014-06-18 18:06:04 +02:00
Marc Delisle
1b56db7daf Merge pull request #1231 from D-storm/sql_views 
fix: sql export views as tables getting ignored
 2014-06-18 12:05:53 -04:00
Dieter Adriaenssens
875df37df2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-17 14:21:00 +02:00
Chirayu Chiripal
9ca3784568 fix: sql export views as tables getting ignored 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-15 23:39:09 +05:30
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 10:07:38 -04:00
Weblate
7279e1b7f8 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-14 15:20:38 +02:00
Haval Abdulkarim
6c7efa1db7 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.6% (517 of 2770)
 2014-06-14 15:20:34 +02:00
Haval Abdulkarim
aaeed70997 Translated using Weblate (English (United Kingdom)) 
Currently translated at 89.6% (2483 of 2770)
 2014-06-14 15:20:31 +02:00
Marc Delisle
a33fcad037 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:19:56 -04:00
Christian Simon
47709d414e Fix 'token mismatch' due to missing server parameter for some AJAX requests 
* server_privileges user duplicate request
* js error_reporting
* cf. https://sourceforge.net/p/phpmyadmin/bugs/3893

Signed-off-by: Christian Simon <simon@swine.de>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:16:53 -04:00
Panagiotis Papazoglou
a7703a3644 Translated using Weblate (Greek) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-14 10:00:21 +02:00
Isaac Bennetch
ddadc4853e Merge branch 'D-storm-so' into QA_4_2 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:40:15 -04:00