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

92626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
cbcacb0f0a Merge branch 'MAINT_4_2_9' into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:44:22 +05:30
Marc Delisle
de12f8359a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-08 08:45:05 -04:00
Weblate
21032ab3b1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-08 14:42:45 +02:00
Michael Koch
dc3cabd654 Translated using Weblate (German) 
Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]
 2014-10-08 14:42:44 +02:00
Marc Delisle
92efd1f7e1 Merge pull request #1374 from ashutoshdhundhara/bug_4554 
bug #4554 Grid-editing timestamp column forces datepicker.
 2014-10-08 08:42:34 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30
Madhura Jayaratne
01d6a06c52 Update Dummy DBI for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:33:25 +05:30
Madhura Jayaratne
c77fafd0d1 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:26:10 +05:30
Madhura Jayaratne
e93e128510 Port 'bug #3120 Events are not exported when using xml' to QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:23:39 +05:30
Weblate
465d672fb0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-07 14:18:21 +02:00
Michael Koch
c1b4895f57 Translated using Weblate (German) 
Currently translated at 95.2% (2636 of 2768 strings)

[CI skip]
 2014-10-07 14:18:19 +02:00
Marc Delisle
d2b9979d03 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-07 08:17:27 -04:00
Weblate
eefd44a89b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-07 07:15:35 +02:00
Alexey Rubinov
27ab463b9b Translated using Weblate (Russian) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-07 07:15:34 +02:00
Xosé Calvo
3ffcbcb52b Translated using Weblate (Galician) 
Currently translated at 86.3% (2389 of 2768 strings)

[CI skip]
 2014-10-07 07:15:32 +02:00
josep constanti
718d02272b Translated using Weblate (Catalan) 
Currently translated at 86.0% (2381 of 2768 strings)

[CI skip]
 2014-10-07 07:15:31 +02:00
P
b240909757 Translated using Weblate (Bulgarian) 
Currently translated at 64.8% (1796 of 2768 strings)

[CI skip]
 2014-10-07 07:15:30 +02:00
Madhura Jayaratne
a82cb7aeae Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 2014-10-07 10:45:00 +05:30
Madhura Jayaratne
2936feaad2 #4548 Inline editing a field converts tab to spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 10:44:09 +05:30
Alexey Rubinov
5db5f2a6d3 Translated using Weblate (Russian) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-07 05:35:41 +02:00
Madhura Jayaratne
48b97ecd06 bug #4252 Database-level permission bug for db names containing underscores 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 08:03:39 +05:30
Burak Yavuz
2079e9cd9a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-06 21:44:32 +02:00
Purodha
ebcac5adeb Translated using Weblate (Colognian) 
Currently translated at 1.0% (30 of 2768 strings)

[CI skip]
 2014-10-06 15:44:11 +02:00
Xavier Navarro
0677cc1347 Translated using Weblate (Catalan) 
Currently translated at 85.9% (2378 of 2768 strings)

[CI skip]
 2014-10-05 19:40:47 +02:00
Peter Dave Hello
408462c53b Translated using Weblate (Traditional Chinese) 
Currently translated at 99.9% (2766 of 2768 strings)

[CI skip]
 2014-10-03 21:18:55 +02:00
Internationalization Ro
02a0680684 Translated using Weblate (Romanian) 
Currently translated at 62.4% (1729 of 2768)

[ci skip]
 2014-10-02 15:44:40 +02:00
Marc Delisle
6000955709 Translated using Weblate (French) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-10-02 15:44:23 +02:00
Michal Čihař
b7f8b8b74b Switch translation server to hosted Weblate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-02 10:37:34 +02:00
Weblate
b002637485 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-02 08:13:14 +02:00
Kristjan Räts
48b601d5ac Translated using Weblate (Estonian) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-10-02 08:13:11 +02:00
Madhura Jayaratne
43ec83fbda bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-02 11:42:44 +05:30
Marc Delisle
9cb2f3e29e Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:20:37 -04:00
Marc Delisle
6c9c0b5dbf [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:20:23 -04:00
Marc Delisle
822ac52395 4.2.9.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:11:20 -04:00
Marc Delisle
304fb2b645 Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:09:12 -04:00
Marc Delisle
c1a3f85fbd [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
 2014-10-01 08:01:00 -04:00
Weblate
01c7f4e3f1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-01 06:31:13 +02:00
Robert Readman
ba37e2641a Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-10-01 06:31:11 +02:00
Atul Pratap Singh
a020eac11a Add js checks in multiple files if data is undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-01 10:00:54 +05:30
Robert Readman
dbdd90511b Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.1% (2494 of 2768)

[ci skip]
 2014-10-01 06:09:20 +02:00
Smita Kumari
34682045bd Merge pull request #1364 from smita786/QA_4_2 
Fix bug #4545
 2014-10-01 00:39:56 +05:30
Smita Kumari
179285bb61 bug fix #4545 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 00:16:14 +05:30
Marc Delisle
58cc1e5ae2 bug #4543 Changing column name can break saved "order by" clause 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:13:21 -04:00
Weblate
d21b4c03fd Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-27 15:13:27 +02:00
Internationalization Ro
834f8ec51f Translated using Weblate (Romanian) 
Currently translated at 62.4% (1729 of 2768)

[ci skip]
 2014-09-27 15:13:24 +02:00
Marc Delisle
deea8c6946 bug in PDF export: title not present in PDF 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 08:39:00 -04:00
Weblate
911d8528d4 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-25 14:18:33 +02:00
கணேஷ் குமார்
472d3346c1 Translated using Weblate (Tamil) 
Currently translated at 37.4% (1037 of 2768)

[ci skip]
 2014-09-25 14:18:30 +02:00
Internationalization Ro
e1a420fbbc Translated using Weblate (Romanian) 
Currently translated at 62.3% (1725 of 2768)

[ci skip]
 2014-09-25 14:18:28 +02:00
Dong-bum Kim
5d60415105 Translated using Weblate (Korean) 
Currently translated at 84.9% (2351 of 2768)

[ci skip]
 2014-09-25 14:18:26 +02:00