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

103150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
40f484e3aa Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-12 17:41:43 -04:00
Marc Delisle
280f306dee Merge commit '404bea4' 2015-10-12 17:19:17 -04:00
Marc Delisle
8cd589a832 Merge pull request #11562 from devenbansod/fix_11561 
Fix #11561
 2015-10-12 17:17:20 -04:00
Deven Bansod
bd49edfb90 Fix 11561 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-13 06:24:12 +05:30
Kristjan Räts
16386e6471 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-12 07:53:39 +02:00
Kristjan Räts
404bea4755 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-12 07:52:44 +02:00
Marc Delisle
5dd4218df1 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 07:00:53 -04:00
Marc Delisle
bfb10f57b0 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:59:55 -04:00
Marc Delisle
2d30407b91 Merge branch 'QA_4_5' 2015-10-11 06:54:29 -04:00
Marc Delisle
41f5f57c1f Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:54:07 -04:00
Weblate
5c6a200042 Merge remote-tracking branch 'origin/master' 2015-10-11 12:53:07 +02:00
Martin Lacina
192ab1d205 Translated using Weblate (Slovak) 
Currently translated at 82.8% (2672 of 3227 strings)

[CI skip]
 2015-10-11 12:53:06 +02:00
Marc Delisle
7239f7946c Merge branch 'QA_4_5' 2015-10-11 06:50:09 -04:00
Marc Delisle
da064eec27 Merge commit 'f6ba32e' 2015-10-11 06:49:50 -04:00
Weblate
835c63aed2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-11 12:49:03 +02:00
Martin Lacina
369be59c08 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2680 of 3210 strings)

[CI skip]
 2015-10-11 12:49:02 +02:00
Marc Delisle
f6ba32e795 Merge pull request #11566 from devenbansod/fix_error_in_11560 
Fix error in PR #11560
 2015-10-11 06:48:58 -04:00
Deven Bansod
0ce416b14c Fix error in PR 11560 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 16:51:49 +05:30
Marc Delisle
fd6ed157a9 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:28:14 -04:00
Marc Delisle
9eb8dd974d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:21:15 -04:00
Marc Delisle
e9cd6b583c Merge pull request #11560 from devenbansod/fix_11520 
Fix #11520
 2015-10-10 15:18:52 -04:00
Deven Bansod
31d19c4cf7 Fix #11520 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 05:29:50 +05:30
Marc Delisle
914c12a9c2 Merge branch 'QA_4_5' 2015-10-10 14:50:15 -04:00
Marc Delisle
98785f5427 Fixes #11558 ChangeLog entry to mark the fix as complete 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 14:49:21 -04:00
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