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

95235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
fafa87ca6f Translated using Weblate (French) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-10-02 15:44:20 +02:00
Michal Čihař
9cb7f4b6c7 Translated using Weblate (Colognian) 
Currently translated at 0.9% (29 of 2964)

[ci skip]
 2014-10-02 15:44:05 +02:00
Marc Delisle
7336975ef1 Translated using Weblate (French) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-02 13:36:37 +02:00
Weblate
a3ef935d84 Merge remote-tracking branch 'origin/master' 2014-10-02 13:35:35 +02:00
Michal Čihař
c8d6aadbb4 Translated using Weblate (Romanian) 
Currently translated at 60.9% (1807 of 2965 strings)

[CI skip]
 2014-10-02 13:35:33 +02:00
Michal Čihař
82d74152aa Translated using Weblate (French) 
Currently translated at 99.9% (2963 of 2965 strings)

[CI skip]
 2014-10-02 13:35:27 +02:00
Marc Delisle
115ec64b1d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-02 05:50:43 -04:00
Michal Čihař
62ae120476 Update po files 2014-10-02 11:41:11 +02:00
Michal Čihař
9743d93990 Work with new strings abstraction layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-02 11:41:07 +02:00
Marc Delisle
d87dc01a0f Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-02 05:33:33 -04:00
Michal Čihař
1552d32830 Switch translation server to hosted Weblate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-02 10:38:59 +02:00
Michal Čihař
c22b9e239c Merge branch 'QA_4_2' 2014-10-02 10:38:39 +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
Madhura Jayaratne
f96841ebf4 Merge branch 'QA_4_2' 2014-10-02 11:44:45 +05:30
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
Madhura Jayaratne
ded8fd52c2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-02 10:05:34 +05:30
Madhura Jayaratne
ec3ec7d13b Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-02 10:04:15 +05:30
Chirayu Chiripal
b9996c5657 Give credits to GSoC 2014 students 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-10-01 23:23:32 +05:30
Marc Delisle
ebf59b62b8 Merge commit '9cb2f3e' 2014-10-01 12:26:13 -04:00
Weblate
1814c53e5f Merge remote-tracking branch 'origin/master' 2014-10-01 17:13:59 +02:00
Kristjan Räts
b5bceca386 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-10-01 17:13:55 +02:00
Atul Pratap Singh
7d23ba3439 Merge commit '01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76' 2014-10-01 20:43:20 +05:30
Atul Pratap Singh
6c83a2f2e3 Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe' 
Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js
 2014-10-01 20:42:21 +05:30
Marc Delisle
ff4be7ee5a Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:31:41 -04:00
Marc Delisle
f152146abe [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
 2014-10-01 08:31:07 -04:00
Marc Delisle
7ff7929a8e Merge commit 'dbdd905' 2014-10-01 08:22:38 -04:00
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
Madhura Jayaratne
5bc5382e05 Pass table to check privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 17:12:58 +05:30
Madhura Jayaratne
dcf2750796 Enable Execute link based on EXECUTE privilege 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 17:02:52 +05:30
Madhura Jayaratne
6e63321db9 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-01 17:01:19 +05:30
Madhura Jayaratne
ebf2d25ea0 Avoid notices due to lack of privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 14:15:16 +05:30
Weblate
08ee730250 Merge remote-tracking branch 'origin/master' 2014-10-01 10:34:58 +02:00
Robert Readman
b00f88f073 Translated using Weblate (English (United Kingdom)) 
Currently translated at 91.4% (2711 of 2964)

[ci skip]
 2014-10-01 10:34:55 +02:00
Madhura Jayaratne
ca59b4910b Since editing a procedure involved dropping and recreating, check also for CREATE ROUTINE privilege to avoid lost procedures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 14:04:30 +05:30
Madhura Jayaratne
2f46112f24 Disable new link when there is no privilege to create procedure 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 13:52:12 +05:30
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
Robert Readman
1122ed52ec Translated using Weblate (English (United Kingdom)) 
Currently translated at 82.6% (2449 of 2964)

[ci skip]
 2014-10-01 06:07:21 +02:00
Smita Kumari
fd6e7cf4e1 resolve merge conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 01:04:19 +05:30
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
45d234f638 Adapt to PMA_String 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:20:19 -04:00
Marc Delisle
faafea0bd1 Merge branch 'QA_4_2' 2014-09-30 13:14:14 -04:00
Marc Delisle
6aab860fd6 Merge commit 'd21b4c0' 2014-09-30 13:14:06 -04:00
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