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

103097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Hugues Peccatte
e8e1650d48 Merge pull request #11428 from Tithugues/useNamespaces_master 
Use namespaces and autoloading.
 2015-10-07 20:41:23 +02:00
Hugues Peccatte
0bc489bfd9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-07 20:22:26 +02:00
Marc Delisle
b239793429 Clarify function name 
Clarify variable name

Remove duplicate test

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-07 11:02:34 -04:00
Michal Čihař
e820e9b0c5 Translated using Weblate (Polish) 
Currently translated at 78.2% (2517 of 3217 strings)

[CI skip]
 2015-10-07 15:19:22 +02:00
Weblate
f4694fb78c Merge remote-tracking branch 'origin/master' 2015-10-07 14:33:53 +02:00
Przemo
95cb0dacf9 Translated using Weblate (Polish) 
Currently translated at 78.2% (2517 of 3217 strings)

[CI skip]
 2015-10-07 14:33:47 +02:00
disorderman
9b2b50dd3c Translated using Weblate (Chinese (China)) 
Currently translated at 84.1% (2707 of 3217 strings)

[CI skip]
 2015-10-07 14:33:42 +02:00
Michal Čihař
a376557d9a Merge remote-tracking branch 'origin/QA_4_5' 2015-10-07 14:33:27 +02:00
Michal Čihař
bb35147500 Merge commit 'feeb54ce8cdb2d4b73b6b3739d6ab8c9116c20f5' 2015-10-07 14:33:18 +02:00
Weblate
9e4d59a880 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-07 14:32:17 +02:00
Przemo
4a24c55ad7 Translated using Weblate (Polish) 
Currently translated at 78.9% (2535 of 3209 strings)

[CI skip]
 2015-10-07 14:32:15 +02:00
disorderman
de72c2312c Translated using Weblate (Chinese (China)) 
Currently translated at 84.9% (2726 of 3209 strings)

[CI skip]
 2015-10-07 14:32:13 +02:00
Michal Čihař
feeb54ce8c Fix file permissions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-07 14:32:04 +02:00
Weblate
83ba191a26 Merge remote-tracking branch 'origin/master' 2015-10-06 22:44:00 +02:00
disorderman
96684c0290 Translated using Weblate (Chinese (China)) 
Currently translated at 83.6% (2692 of 3217 strings)

[CI skip]
 2015-10-06 22:43:54 +02:00
Marc Delisle
621825fadd Merge branch 'QA_4_5' 2015-10-06 16:43:39 -04:00
Marc Delisle
8b615feb1a Merge commit 'ca85cd1' 2015-10-06 16:43:33 -04:00
Marc Delisle
8668a92716 Merge commit 'efe0416' 2015-10-06 16:43:19 -04:00
Marc Delisle
ee958f08cb ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 16:42:47 -04:00
Weblate
ca85cd134a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-06 22:39:49 +02:00
disorderman
1fb6395e61 Translated using Weblate (Chinese (China)) 
Currently translated at 84.4% (2711 of 3209 strings)

[CI skip]
 2015-10-06 22:39:46 +02:00
Marc Delisle
efe0416565 Merge pull request #11545 from udan11/QA_4_5 
Fix #11542. Import parser broken in 4.5.x.x.
 2015-10-06 16:39:38 -04:00
Dan Ungureanu
6f802746d6 Fix #11542. Import parser broken in 4.5.x.x. 
Cherry-picked udan11/sql-parser@402890bc7b.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-06 23:20:54 +03:00
Hugues Peccatte
d1c6257136 Fix merge. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-06 22:01:39 +02:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00
Marc Delisle
911217e6b4 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 07:33:41 -04:00
Marc Delisle
64758a0c82 Merge commit 'f830b07' 2015-10-06 07:31:38 -04:00
Marc Delisle
087a4035b5 Merge commit '9ee5e0d' 2015-10-06 07:31:28 -04:00
Marc Delisle
065d6e33ad Merge commit 'e4d422c' 2015-10-06 07:31:10 -04:00