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

92298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00
Atul Pratap Singh
0306e2bd88 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:20:27 +05:30
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 00:39:28 +05:30
Michal Čihař
2b8bb91bc3 Merge pull request #1223 from D-storm/bug-4454 
bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da...
 2014-06-12 13:36:23 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-12 16:55:27 +05:30
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
Michal Čihař
953c7415ad Separate check for password cookie 
Otherwise it would not be possible to recall user name.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:47:04 +02:00
Weblate
76c051bcea Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-12 09:44:11 +02:00
Burak Yavuz
e664c931d2 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:09 +02:00
Matías Bellone
480b992aae Translated using Weblate (Spanish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:06 +02:00
Giovanni Sora
bfb0f98a91 Translated using Weblate (Interlingua) 
Currently translated at 51.1% (1417 of 2770)
 2014-06-12 09:44:03 +02:00
Marc Delisle
ffb543b6e3 Translated using Weblate (French) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:01 +02:00
Dieter Adriaenssens
88910393e5 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2768 of 2770)
 2014-06-12 09:44:00 +02:00
Michal Čihař
29094da204 Translated using Weblate (Czech) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:43:58 +02:00
Michal Čihař
7cba81de27 Regenerate cookie encryption IV for every session 
The IV for cookie encryption was generated just once for every browser
and kept in a cookie. Generating it for every session is much better to
avoid information leaks (eg. that same user has logged in).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:41:27 +02:00
Michal Čihař
b252cb9981 Use better source of entropy for mcrypt IV 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:16:20 +02:00
Kristjan Räts
59bb241cf1 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-11 09:06:45 +02:00
Domen
e9f7dafd21 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-10 21:34:11 +02:00
Marc Delisle
92aaa7f900 Update po files 2014-06-10 12:45:56 -04:00
Marc Delisle
478a105ed6 Merge pull request #1218 from D-storm/bug-4448 
Bug-4448: Dump binary columns in hexadecimal notation not working
 2014-06-10 12:39:18 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-10 19:00:16 +05:30
Michal Čihař
e71869daf1 Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-06-10 09:15:00 +02:00
Michal Čihař
15b5051928 Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-06-10 09:14:07 +02:00
Weblate
5a6dad0aba Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-10 08:58:14 +02:00
கணேஷ் குமார்
2cb47afab9 Translated using Weblate (Tamil) 
Currently translated at 31.0% (860 of 2770)
 2014-06-10 08:58:11 +02:00
Giovanni Sora
85d3b08ba7 Translated using Weblate (Interlingua) 
Currently translated at 50.5% (1400 of 2770)
 2014-06-10 08:58:08 +02:00
Yasar
14d66a0137 Translated using Weblate (German) 
Currently translated at 93.9% (2603 of 2770)
 2014-06-10 08:58:06 +02:00
Michal Čihař
d2c184a3c6 Merge pull request #1216 from ibennetch/4449 
Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings
 2014-06-10 08:58:00 +02:00
Isaac Bennetch
307dd3b798 Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2014-06-09 16:37:43 -04:00