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

103126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b7c1a14e48 Merge branch 'QA_4_5' 2015-10-10 09:53:04 -04:00
Marc Delisle
2b315a413f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 09:52:31 -04:00
Marc Delisle
e75eca5a3c Merge pull request #11564 from udan11/QA_4_5 
Partial fix for #11558.
 2015-10-10 09:51:00 -04:00
Dan Ungureanu
5e8e47072e Partial fix for #11558. 
Updated sql-parser library to udan11/sql-parser@42c34ddd1f (v3.0.3).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-10 15:53:23 +03:00
Marc Delisle
b46c81f3a1 Merge branch 'QA_4_5' 2015-10-09 21:10:49 -04:00
Marc Delisle
e4e991d3fc Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 21:10:28 -04:00
Marc Delisle
8f88467ef9 Merge commit '98daf29' 2015-10-09 21:08:45 -04:00
Weblate
bc737700ee Merge remote-tracking branch 'origin/master' 2015-10-10 03:06:05 +02:00
Michał VonFlynee
185b8dba88 Translated using Weblate (Polish) 
Currently translated at 78.8% (2544 of 3227 strings)

[CI skip]
 2015-10-10 03:06:04 +02:00
Francisco Rocha
f930cd3b2c Translated using Weblate (English (United Kingdom)) 
Currently translated at 79.7% (2574 of 3227 strings)

[CI skip]
 2015-10-10 03:06:02 +02:00
Marc Delisle
9b85cdbbd4 Merge pull request #11552 from madhuracj/cookie 
Fix #11551 Fatal error when switched to master from QA_4_5
 2015-10-09 21:05:58 -04:00
Weblate
167022cb67 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-10 03:05:34 +02:00
Michał VonFlynee
f33af5aa6b Translated using Weblate (Polish) 
Currently translated at 79.5% (2554 of 3210 strings)

[CI skip]
 2015-10-10 03:05:34 +02:00
Francisco Rocha
905834507a Translated using Weblate (English (United Kingdom)) 
Currently translated at 80.4% (2584 of 3210 strings)

[CI skip]
 2015-10-10 03:05:33 +02:00
Marc Delisle
3003a3545f Merge pull request #11554 from madhuracj/cookies 
Fix cookies clearing on version change
 2015-10-09 21:05:29 -04:00
Madhura Jayaratne
05c22016ee Fix cookies clearing on version change 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-10 08:26:40 +11:00
Domen
3785c33849 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-09 22:58:19 +02:00
Domen
98daf29397 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-09 22:57:36 +02:00
Παναγιώτης Παπάζογλου
2d7ade713f Translated using Weblate (Greek) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-09 22:42:31 +02:00
Hugues Peccatte
3cd139f163 Remove useless 'use'. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-09 22:15:55 +02:00
Hugues Peccatte
f0a5566efe Remove useless include. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-09 22:02:24 +02:00
Marc Delisle
7311d59fa9 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 15:12:45 -04:00
Marc Delisle
f4604e01e5 Translated using Weblate (French) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-09 20:01:36 +02:00
Burak Yavuz
a1185d2769 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-09 19:49:00 +02:00
Michal Čihař
d22933b845 Merge remote-tracking branch 'weblate-master/master' 2015-10-09 19:18:27 +02:00
Burak Yavuz
56147d972c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-10-09 18:01:39 +02:00
Marc Delisle
04b54df704 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 12:00:55 -04:00
Marc Delisle
509dbe3481 Fix update-po due to namespace and filename changes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 12:00:21 -04:00
Marc Delisle
fd314bc942 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-09 16:58:41 +02:00
Stefano Martinelli
6f286df535 Translated using Weblate (Italian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-10-09 16:06:32 +02:00
Stefano Martinelli
4ce51de95a Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-09 16:04:30 +02:00
Burak Yavuz
fa58a99ad2 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-09 14:34:44 +02:00
Παναγιώτης Παπάζογλου
71aed81069 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-09 14:04:11 +02:00
Weblate
dd92dacf2f Merge remote-tracking branch 'origin/master' 2015-10-09 13:24:58 +02:00
Terry Weng
d57c8c3cd8 Translated using Weblate (Chinese (China)) 
Currently translated at 84.9% (2734 of 3217 strings)

[CI skip]
 2015-10-09 13:24:55 +02:00
Marc Delisle
603bf8263c Merge branch 'QA_4_5' 2015-10-09 07:22:34 -04:00
Marc Delisle
60b84af80f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 07:21:45 -04:00
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5' 
Conflicts:
	js/messages.php
 2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 10:06:49 +11:00
Madhura Jayaratne
54b0409cc1 The error happens on version downgrade as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 09:40:20 +11:00
Madhura Jayaratne
208712796d Increase cookie version and improve cookie clearing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 08:36:37 +11:00
Marc Delisle
b5d6170b22 Clarify function name 
Remove function's side effect on globals

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-08 11:03:22 -04:00
Madhura Jayaratne
bf22e3c492 Merge branch 'QA_4_5' 2015-10-08 19:15:35 +11:00
Weblate
b6c4ce6144 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-08 10:09:51 +02:00
Michal Čihař
18b6413840 Translated using Weblate (Polish) 
Currently translated at 78.9% (2535 of 3209 strings)

[CI skip]
 2015-10-08 10:09:49 +02:00
Madhura Jayaratne
5e7a8fac43 Fix #11546 "Visualize GIS data" seems to be broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-08 19:09:33 +11:00
Hugues Peccatte
37d2a661c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:49:49 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
af7eaeb047 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:51:21 +02:00
Hugues Peccatte
191334fac8 Fix HTML typo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:14:56 +02:00