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

101633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
dda7139f19 Add missing dummy queries 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:35:01 -04:00
Marc Delisle
c3015c6855 Add a missing dummy query 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:17:20 -04:00
Marc Delisle
bcb699f72d Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:01:42 -04:00
Madhura Jayaratne
1b96c9120c Remove tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 22:04:02 +05:30
Madhura Jayaratne
65269fa9ad Merge branch 'QA_4_4' 2015-08-06 22:00:04 +05:30
Madhura Jayaratne
fe12f2f9e2 Table list in navigation collapses when entering into a table in another page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 21:53:13 +05:30
Madhura Jayaratne
8a16c294df Fix indentation in doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 18:46:25 +05:30
Madhura Jayaratne
70d990c337 Preserver indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 18:43:10 +05:30
Marc Delisle
6c1e2d7eb6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 08:19:28 -04:00
Marc Delisle
e7028ad263 Merge pull request #11359 from udan11/curl_fix 
Fixes cURL timeout.
 2015-08-06 08:17:58 -04:00
Dan Ungureanu
63b1d1c005 Fixes cURL timeout. 
cURL tries to reverse DNS the server and because it cannot it waits for the timeout.
It depends on machine configuration.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-06 15:00:44 +03:00
Madhura Jayaratne
687d8d9c9c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-06 16:44:55 +05:30
Madhura Jayaratne
a8a2986b56 Fix more coding style issues related to function call signature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 16:44:09 +05:30
Marc Delisle
6b9addc765 Translated using Weblate (French) 
Currently translated at 99.9% (3199 of 3200 strings)

[CI skip]
 2015-08-06 13:13:25 +02:00
Weblate
e6c8a6faf5 Merge remote-tracking branch 'origin/master' 2015-08-06 12:47:26 +02:00
Xavier Navarro
79e92cbeb8 Translated using Weblate (Catalan) 
Currently translated at 95.9% (3071 of 3200 strings)

[CI skip]
 2015-08-06 12:47:22 +02:00
Madhura Jayaratne
bb1646dec7 Fix coding style issues related to function call signature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 16:16:27 +05:30
Madhura Jayaratne
a60987cee1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-06 09:44:17 +05:30
Madhura Jayaratne
34a484ec96 Fix #11345 Token mismatch error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-06 09:40:28 +05:30
Isaac Bennetch
9ad20e82d5 Merge pull request #11330 from devenbansod/1396C 
Fixed some errors in SHA256 implementation
 2015-08-05 22:42:00 -04:00
Domen
d6ec203cc2 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-05 23:30:13 +02:00
Marc Delisle
12e286ca0b Clarify doc for some directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 15:46:57 -04:00
Marc Delisle
736ac22c5d Merge pull request #11354 from udan11/fix_lint_utf8 
Fix UTF strings in linter.
 2015-08-05 13:38:32 -04:00
Dan Ungureanu
13ff72c4d7 Fix UTF strings in linter. 
Updated sql-parser to udan11/sql-parser@8a1011e974.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-05 19:01:51 +03:00
Weblate
833a6e04db Merge remote-tracking branch 'origin/master' 2015-08-05 15:47:14 +02:00
Giovanni Sora
a4d504590c Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2255 of 3200 strings)

[CI skip]
 2015-08-05 15:47:11 +02:00
Marc Delisle
db19812acf Merge branch 'QA_4_4' 2015-08-05 09:46:18 -04:00
Marc Delisle
d4f402d597 Merge commit '761c8dd' 2015-08-05 09:46:08 -04:00
Weblate
1792dbaab7 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-05 15:45:52 +02:00
Stefan Murariu
27ecc9a6b8 Translated using Weblate (Romanian) 
Currently translated at 59.1% (1796 of 3038 strings)

[CI skip]
 2015-08-05 15:45:49 +02:00
Marc Delisle
fd1b36f631 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 09:44:50 -04:00
Dan Ungureanu
bbd581a906 Fixes #11320. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 09:43:14 -04:00
Stefan Murariu
b3dcc166b8 Translated using Weblate (Romanian) 
Currently translated at 55.2% (1767 of 3200 strings)

[CI skip]
 2015-08-05 12:40:37 +02:00
Kristjan Räts
dacade9272 Translated using Weblate (Estonian) 
Currently translated at 99.5% (3185 of 3200 strings)

[CI skip]
 2015-08-05 12:40:35 +02:00
Marc Delisle
6d75998782 Translated using Weblate (French) 
Currently translated at 99.8% (3196 of 3200 strings)

[CI skip]
 2015-08-05 12:40:27 +02:00
Burak Yavuz
09a0f382a6 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-05 12:38:10 +02:00
Stefano Martinelli
12a4a94598 Translated using Weblate (Italian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-05 11:54:18 +02:00
Michal Čihař
c0aa500059 Merge remote-tracking branch 'weblate/master' 
Conflicts:
	po/et.po
 2015-08-05 10:52:11 +02:00
Kristjan Räts
e38ff1d04d Translated using Weblate (Estonian) 
Currently translated at 99.2% (3175 of 3200 strings)

[CI skip]
 2015-08-05 10:50:48 +02:00
Michal Čihař
2e41c96938 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-05 10:49:58 +02:00
Stefan Murariu
761c8dde00 Translated using Weblate (Romanian) 
Currently translated at 59.0% (1795 of 3038 strings)

[CI skip]
 2015-08-05 10:45:46 +02:00
Guilherme Seibt
8323caaf2e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-08-05 10:45:40 +02:00
Stefano Martinelli
2658dcd56d Translated using Weblate (Italian) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-08-05 10:45:36 +02:00
Marek Tomaštík
88eec05535 Translated using Weblate (English (United Kingdom)) 
Currently translated at 88.1% (2678 of 3038 strings)

[CI skip]
 2015-08-05 10:45:32 +02:00
Weblate
441c23e997 Merge remote-tracking branch 'origin/master' 2015-08-05 10:45:01 +02:00
Kristjan Räts
64461b097c Translated using Weblate (Estonian) 
Currently translated at 99.1% (3172 of 3200 strings)

[CI skip]
 2015-08-05 10:44:57 +02:00
Michal Čihař
201731121a Simplify the message 
Having uploaded and moved is confusing for translators and for user it's
uploaded file which can't be read.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-05 10:44:05 +02:00
Andrey Aleksanyants
c11f25de6c Translated using Weblate (Armenian) 
Currently translated at 49.5% (1506 of 3038 strings)

[CI skip]
 2015-08-05 08:52:22 +02:00
Marc Delisle
2338cb5a38 Merge pull request #11348 from netroby/hotfix/strict-check-v3 
Strict check for create_addfield.lib.php
 2015-08-04 07:37:47 -04:00
Guilherme Seibt
8d672ede25 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.2% (3015 of 3200 strings)

[CI skip]
 2015-08-04 12:48:41 +02:00