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

101652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
82bc23e24f Add missing space between text and doc links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 20:58:44 +05:30
Madhura Jayaratne
34ffea28c0 recaptchalib.php has also been moved 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 17:28:45 +05:30
Madhura Jayaratne
4526ccc446 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-07 17:23:01 +05:30
Madhura Jayaratne
37d50745f1 sql-formatter is no lognger used. Exclude sql-parser instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 17:22:18 +05:30
Weblate
6191daaf67 Merge remote-tracking branch 'origin/master' 2015-08-07 13:35:40 +02:00
Marc Delisle
daec07da36 Translated using Weblate (French) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-07 13:35:35 +02:00
Madhura Jayaratne
92f155ed38 Check 'Add constraints' by default since InnoDB is commonly used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 17:04:56 +05:30
Madhura Jayaratne
4c183da338 Display correct cursor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 16:21:48 +05:30
Madhura Jayaratne
cbebf79716 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 16:03:19 +05:30
Madhura Jayaratne
451bec8414 Add column header for count column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 15:05:44 +05:30
Madhura Jayaratne
43e4e5d2f2 Clear internal cache at script handler upon version upgrade 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 13:31:03 +05:30
Madhura Jayaratne
e35450746b Merge branch 'QA_4_4' 
Conflicts:
	js/server_databases.js
 2015-08-07 07:35:41 +05:30
Madhura Jayaratne
47d57ede46 Organize ChangeLog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 07:33:20 +05:30
Madhura Jayaratne
e21c3c90b1 Fix #11364 JS error while trying to auto navigate to db structure page when db creation has failed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 07:32:17 +05:30
Hugues Peccatte
7f2d6698ca Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-07 00:02:24 +02:00
Hugues Peccatte
c46e6717b0 Update PHPDoc. 
Make PHPCS happy.
Minor coding style modification.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-07 00:02:10 +02:00
Marc Delisle
ad5baa88e9 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 18:00:16 -04:00
Hugues Peccatte
1186395f8c Set PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-06 23:37:46 +02:00
Marc Delisle
c3c196cad8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:49:17 -04:00
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