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

101674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni Sora
88010e5d99 Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2256 of 3201 strings)

[CI skip]
 2015-08-09 11:30:58 +02:00
Marc Delisle
d4851d5898 Translated using Weblate (French) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-09 11:30:49 +02:00
Stefano Martinelli
4e6ec806d4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-08 22:19:12 +02:00
Marc Delisle
7c0fb416b5 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:53:26 -04:00
Marc Delisle
f274aecc96 Merge branch 'QA_4_4' 2015-08-08 13:52:56 -04:00
Marc Delisle
1894a22dbf Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:52:09 -04:00
Marc Delisle
b2176f477e Merge branch 'QA_4_4' 2015-08-08 13:50:25 -04:00
Marc Delisle
94a3c367f2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:49:49 -04:00
Marc Delisle
b85267c151 Merge pull request #11369 from devenbansod/issue_11367 
Fix Issue #11367
 2015-08-08 13:47:56 -04:00
Deven Bansod
72afd81c43 Do not act, if no row is selected from query output 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-08-08 23:54:16 +05:30
Marc Delisle
23aecf5123 Merge branch 'QA_4_4' 2015-08-08 12:17:08 -04:00
Marc Delisle
cbb921a2ec 4.4.13.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 12:15:59 -04:00
Marc Delisle
fafa03f9af Revert "Handle comments in the beginning of the query" 
This reverts commit 55a2d06cca.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 12:15:16 -04:00
Marc Delisle
df01d6a3bb Use github references in ChangeLog for 4.5.0 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 07:13:15 -04:00
Madhura Jayaratne
56b38eaa6f Pre-load rename and copy operations with current database name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 21:10:01 +05:30
Madhura Jayaratne
6cb838cef8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-07 20:59:18 +05:30
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
Marc Delisle
c15a5da663 Adjust releasing tasks 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-07 10:04:02 -04:00
Marc Delisle
981abb95f6 4.4.14 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-07 09:27:28 -04:00
Marc Delisle
76114b8db0 Merge branch 'QA_4_4' 2015-08-07 09:26:02 -04:00
Marc Delisle
03753cacf7 4.4.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-07 09:25:40 -04:00
Marc Delisle
9835106647 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-07 08:02:30 -04:00
Marc Delisle
def4b9f492 Missing global declaration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-07 08:01:22 -04:00
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