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

93209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
1cd945e548 Merge commit '59bb241cf13fd9a02626eb73daf5a5ca8476b29e' 2014-06-12 09:44:51 +02:00
Marc Delisle
a6d379caf2 Since PHP 5.3.0, it's not longer required to call srand() before 
mcrypt_create_iv().

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-11 08:31:23 -04:00
Weblate
ada85ff63e Merge remote-tracking branch 'origin/master' 2014-06-11 14:08:21 +02:00
Giovanni Sora
359a9c3d53 Translated using Weblate (Interlingua) 
Currently translated at 51.4% (1441 of 2803)
 2014-06-11 14:08:17 +02:00
Kristjan Räts
0e4b51ac2f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-11 14:08:15 +02:00
Dieter Adriaenssens
c17d6e3f9a Translated using Weblate (Dutch) 
Currently translated at 99.6% (2793 of 2803)
 2014-06-11 14:08:13 +02:00
Michal Čihař
42111aa0e9 Translated using Weblate (Czech) 
Currently translated at 99.1% (2780 of 2803)
 2014-06-11 14:08:11 +02:00
Marc Delisle
08790597c7 Merge pull request #1220 from smita786/gsoc_central_columns_list 
security bug fixes
 2014-06-11 08:08:08 -04:00
Smita Kumari
b749a7b1d6 security bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

use existing escapeHtml function

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-11 17:31:36 +05:30
Kristjan Räts
59bb241cf1 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-11 09:06:45 +02:00
Matías Bellone
2ca9001608 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-11 04:59:43 +02:00
Domen
a92fe0541b Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 21:35:20 +02:00
Domen
e9f7dafd21 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-10 21:34:11 +02:00
Burak Yavuz
8371ae9ea3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 19:40:03 +02:00
Marc Delisle
ee063a664d Translated using Weblate (French) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 19:15:45 +02:00
Marc Delisle
548982acf7 Update po files 2014-06-10 12:46:53 -04:00
Marc Delisle
1c47963a82 Merge commit '92aaa7f' 2014-06-10 12:46:32 -04:00
Marc Delisle
92aaa7f900 Update po files 2014-06-10 12:45:56 -04:00
Weblate
a4d35bcc1b Merge remote-tracking branch 'origin/master' 2014-06-10 18:44:23 +02:00
Burak Yavuz
331e7b9fda Translated using Weblate (Turkish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 18:44:20 +02:00
Marc Delisle
44cc200650 Merge commit '478a105' 2014-06-10 12:43:42 -04:00
Marc Delisle
a83ca5d73b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 12:43:07 -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
Matías Bellone
c498065b1a Translated using Weblate (Spanish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 17:32:45 +02:00
Marc Delisle
3658b5a9fd Translated using Weblate (French) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 16:42:43 +02:00
Kristjan Räts
ed9d14d8ff Translated using Weblate (Estonian) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 16:00:48 +02:00
Burak Yavuz
3cd3f1ba13 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 15:35:42 +02: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
Marc Delisle
b43a8553ea Update po files 2014-06-10 08:47:42 -04:00
Marc Delisle
b3ce71f569 Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 08:47:07 -04:00
Weblate
5092650780 Merge remote-tracking branch 'origin/master' 2014-06-10 14:45:01 +02:00
Anders Jonsson
8debc309ba Translated using Weblate (Swedish) 
Currently translated at 98.9% (2770 of 2800)
 2014-06-10 14:44:58 +02:00
Marc Delisle
8cd6851fb4 Translated using Weblate (French) 
Currently translated at 99.9% (2800 of 2801)
 2014-06-10 14:44:55 +02:00
Marc Delisle
62a1d6d030 Merge pull request #1215 from smita786/gsoc_central_columns_list 
using $GLOBALS['controllink'] for queries being executed on cebtral coulumns tab...
 2014-06-10 08:44:52 -04:00
Smita Kumari
ac759f96b4 using ['controllink'] for queries veing executed on cebtral coulumns table 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

use link 'userlink' for query being fired on tables other than central columns table

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-10 17:57:01 +05:30
Weblate
7421cbe264 Merge remote-tracking branch 'origin/master' 2014-06-10 14:20:13 +02:00
Marc Delisle
bc6c418575 Translated using Weblate (French) 
Currently translated at 99.8% (2798 of 2801)
 2014-06-10 14:20:09 +02:00
Marc Delisle
0aa22fd223 Merge pull request #1217 from nijel/remove-table-status 
Remove workaround for older MySQL versions
 2014-06-10 08:20:06 -04:00
Michal Čihař
96366ce7bc Remove no longer used caching configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:15 +02:00
Michal Čihař
4c328aaf03 Remove workaround for older MySQL versions 
Remove workaround originally implemented for MySQL < 5.0.2, but also
useful in 5.1.x times for listing tables within database when
permissions on one of database directories are wrong.

I've tested this with several MySQL versions and it does not seem to be
needed now, the INFORMATION SCHEMA works correctly even if some of the
database directories have wrong permissions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:14 +02:00
Michal Čihař
dbd18940be Remove explicit unsetting of local variables 
This was useful in global scope, but makes no sense when used inside
method as all it's variables are cleaned up anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
697cbf22d5 Simplify code 
foreach on empty list does nothing, so we can skip the initial
condition.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Weblate
c8eefc22b6 Merge remote-tracking branch 'origin/master' 2014-06-10 09:29:49 +02:00
Giovanni Sora
434ded7bc5 Translated using Weblate (Interlingua) 
Currently translated at 50.8% (1424 of 2801)
 2014-06-10 09:29:45 +02:00
Michal Čihař
ecfcba84f1 Correct parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:26:08 +02:00
Michal Čihař
6751384d16 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 09:17:47 +02:00
Michal Čihař
e1a67d0d00 Merge commit '2cb47afab9f65a5dbcc2b1c61cd35c2407c90308' 2014-06-10 09:17:37 +02:00
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
6dfbbd367a Merge remote-tracking branch 'origin/master' 2014-06-10 08:59:32 +02:00