gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,165 Commits 12 Branches 481 Tags 2.4 GiB
822ff85ff7
Commit Graph

102165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
822ff85ff7 Merge branch 'QA_4_5' 2015-08-28 19:46:37 +10:00
Madhura Jayaratne
2c4ef3888d Fix bug - Do not export sys database when exporting server 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 19:44:33 +10:00
diprofinfiniti
ee9c505175 Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 06:06:51 +02:00
diprofinfiniti
a3d0f5fdd9 Translated using Weblate (Malay) 
Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
 2015-08-28 06:06:41 +02:00
Marc Delisle
8e3f821eba Remove dead code 
Initialize array

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 15:19:47 -04:00
Marc Delisle
c76e7c8c46 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 15:13:58 -04:00
Marc Delisle
571f50ea65 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-27 12:59:24 -04:00
Marc Delisle
12c28e09a9 Merge commit 'd5ee22f' 2015-08-27 12:59:14 -04:00
Weblate
ec717c5b90 Merge remote-tracking branch 'origin/master' 2015-08-27 18:59:06 +02:00
Ann + J.M
a16e0bae7b Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 18:59:02 +02:00
Marc Delisle
a2b9fac8bd Merge commit '2efad57' 2015-08-27 12:58:23 -04:00
Marc Delisle
0d67cfeda5 Merge commit 'e6c5193' 2015-08-27 12:58:10 -04:00
Weblate
d5ee22fae2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-08-27 18:57:06 +02:00
Ann + J.M
c747a5275d Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 18:57:04 +02:00
Chien Wei Lin
e6e6c9b4aa Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.8% (3201 of 3207 strings)

[CI skip]
 2015-08-27 18:57:03 +02:00
Xavier Navarro
2aa91da197 Translated using Weblate (Catalan) 
Currently translated at 98.2% (3151 of 3207 strings)

[CI skip]
 2015-08-27 18:57:01 +02:00
Luis Garcia
2efad579ec Improve wording 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 12:56:48 -04:00
Phillip Rohmberger
9473b97b2e Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 17:48:27 +02:00
Ann + J.M
1bde767b52 Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 17:48:04 +02:00
Ann + J.M
e6c5193214 Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 17:47:22 +02:00
Weblate
5fb507470a Merge remote-tracking branch 'origin/master' 2015-08-27 15:54:39 +02:00
Chien Wei Lin
c28fd54a65 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.8% (3201 of 3207 strings)

[CI skip]
 2015-08-27 15:54:35 +02:00
Xavier Navarro
c5d3da1d44 Translated using Weblate (Catalan) 
Currently translated at 98.2% (3151 of 3207 strings)

[CI skip]
 2015-08-27 15:54:33 +02:00
Hugues Peccatte
acde1ebb33 Make PHPCS happy 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-27 15:54:22 +02:00
Marc Delisle
be11ed4a34 Merge branch 'QA_4_5' 2015-08-27 06:57:32 -04:00
Marc Delisle
f61cbbdef1 Merge commit '47b0b4b' 2015-08-27 06:57:27 -04:00
Marc Delisle
1cac9d3495 Clarify doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 06:56:54 -04:00
Michal Čihař
9d64050808 Translated using Weblate (Malay) 
Currently translated at 10.5% (339 of 3207 strings)

[CI skip]
 2015-08-27 12:47:08 +02:00
Michal Čihař
47b0b4b871 Translated using Weblate (Malay) 
Currently translated at 10.5% (339 of 3207 strings)

[CI skip]
 2015-08-27 12:47:02 +02:00
Marc Delisle
8918b0fcff Merge branch 'QA_4_5' 2015-08-27 06:31:47 -04:00
Marc Delisle
8af712c333 Improve a FAQ entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-27 06:31:21 -04:00
Weblate
5fd411c3c1 Merge remote-tracking branch 'origin/master' 2015-08-27 12:00:45 +02:00
diprofinfiniti
fe313f6a9c Translated using Weblate (Malay) 
Currently translated at 10.5% (339 of 3207 strings)

[CI skip]
 2015-08-27 12:00:41 +02:00
Marc Delisle
0be7b72cf5 Merge branch 'QA_4_5' 2015-08-27 06:00:17 -04:00
Marc Delisle
be30dd1d5a Merge commit 'c192cbc' 2015-08-27 06:00:06 -04:00
Weblate
99a6482c86 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-08-27 11:59:24 +02:00
diprofinfiniti
cab621b248 Translated using Weblate (Malay) 
Currently translated at 10.5% (339 of 3207 strings)

[CI skip]
 2015-08-27 11:59:22 +02:00
Marc Delisle
c192cbc5d8 Merge pull request #11437 from devenbansod/fix_#11433 
Fix #11433
 2015-08-27 05:59:19 -04:00
Deven Bansod
e75d5f1145 Fix #11433 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-08-27 18:12:36 +05:30
Michal Čihař
67066d6709 Merge branch 'QA_4_5' 2015-08-27 07:08:56 +02:00
Michal Čihař
b0ee38a4fd Merge commit 'dba9c7418f8cf29cd1d2d31a316235e6e04986ff' 2015-08-27 07:08:50 +02:00
Michal Čihař
3e6be008e1 Merge branch 'QA_4_4' into QA_4_5 2015-08-27 07:08:33 +02:00
Michal Čihař
f849c697a9 Stick to known working version of runkit 
Current runkit doesn't seem to compile...

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-27 07:04:16 +02:00
Weblate
bb2c60e333 Merge remote-tracking branch 'origin/master' 2015-08-27 05:09:30 +02:00
Luis Garcia
418a98d050 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 05:09:25 +02:00
Madhura Jayaratne
a4ea83fab6 Merge branch 'QA_4_5' 2015-08-27 13:08:12 +10:00
Weblate
dba9c7418f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-08-27 05:07:46 +02:00
Luis Garcia
9613d0e533 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-27 05:07:44 +02:00
Madhura Jayaratne
88710c5312 Fix #11434 Class 'SqlParser\Lexer' not found 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-27 13:07:29 +10:00
Luis Garcia
c2a75770df Translated using Weblate (Spanish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-26 18:09:05 +02:00