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

107695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c48f2a6830 Merge branch 'QA_4_6' 2016-11-08 14:48:48 +01:00
Michal Čihař
164176cbbe Changelog entry for #12666 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:48:44 +01:00
Michal Čihař
9df6c8258c Merge remote-tracking branch 'origin/pull/12666' into QA_4_6 2016-11-08 14:48:16 +01:00
Michal Čihař
2c90866b18 Merge branch 'QA_4_6' 2016-11-08 14:46:01 +01:00
Michal Čihař
af73f564dd Changelog entry for #12678 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:45:46 +01:00
Michal Čihař
38a804edde Merge remote-tracking branch 'origin/pull/12678' into QA_4_6 2016-11-08 14:45:10 +01:00
Michal Čihař
f9dc8c6bb8 Merge branch 'QA_4_6' 2016-11-08 14:44:56 +01:00
Weblate
b339553338 Merge remote-tracking branch 'origin/master' 2016-11-08 06:38:52 +01:00
Deven Bansod
36476c77a8 Merge branch 'QA_4_6' 
Conflicts:
	po/da.po
	po/id.po
	po/ko.po
	po/pt_BR.po
 2016-11-08 11:09:57 +05:30
popinha13
13f3b2b1ab Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.7% (2996 of 3230 strings)

[CI skip]
 2016-11-08 06:38:51 +01:00
Lee Joon Haeng
8beba8a07f Translated using Weblate (Korean) 
Currently translated at 80.2% (2591 of 3230 strings)

[CI skip]
 2016-11-08 06:38:50 +01:00
Nils Van Zuijlen
4b6eb187d4 Translated using Weblate (French) 
Currently translated at 98.9% (3197 of 3230 strings)

[CI skip]
 2016-11-08 06:38:49 +01:00
Nils Van Zuijlen
6b70628e36 Translated using Weblate (Breton) 
Currently translated at 16.9% (546 of 3230 strings)

[CI skip]
 2016-11-08 06:38:47 +01:00
Deven Bansod
7b4f4a1bff Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-08 11:08:33 +05:30
Deven Bansod
ff3dd90172 Remove unused deubgging calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-08 11:07:41 +05:30
Weblate
303da921a2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-08 06:37:12 +01:00
popinha13
80ad2da2b8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.2% (3001 of 3219 strings)

[CI skip]
 2016-11-08 06:37:11 +01:00
Lee Joon Haeng
1fcfdb9963 Translated using Weblate (Korean) 
Currently translated at 80.5% (2592 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
dec24a713e Translated using Weblate (French) 
Currently translated at 99.5% (3205 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
1503912dc1 Translated using Weblate (Breton) 
Currently translated at 16.9% (547 of 3219 strings)

[CI skip]
 2016-11-08 06:37:09 +01:00
Prasna Lukito
39abc62b37 Translated using Weblate (Indonesian) 
Currently translated at 69.9% (2252 of 3219 strings)

[CI skip]
 2016-11-08 00:45:10 +01:00
Prasna Lukito
6e757ef1b6 Translated using Weblate (Indonesian) 
Currently translated at 69.5% (2246 of 3230 strings)

[CI skip]
 2016-11-08 00:45:02 +01:00
Guilherme Rocha
eb5fa46b0c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2999 of 3219 strings)

[CI skip]
 2016-11-07 14:07:31 +01:00
popinha13
14317c7734 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2998 of 3219 strings)

[CI skip]
 2016-11-07 13:57:56 +01:00
Lee Joon Haeng
5795f3d15a Translated using Weblate (Korean) 
Currently translated at 80.3% (2585 of 3219 strings)

[CI skip]
 2016-11-06 06:45:21 +01:00
Lee Joon Haeng
2c40a2d743 Translated using Weblate (Korean) 
Currently translated at 80.0% (2584 of 3230 strings)

[CI skip]
 2016-11-06 06:45:16 +01:00
Jørgen Thomsen
8fbff5f19e Translated using Weblate (Danish) 
Currently translated at 96.0% (3092 of 3219 strings)

[CI skip]
 2016-11-04 18:44:31 +01:00
Weblate
2cdb783e23 Merge remote-tracking branch 'origin/master' 2016-11-03 20:09:44 +01:00
Deven Bansod
d87142baa8 Remove unneeded file 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-04 00:40:02 +05:30
Lee Joon Haeng
c31e5b7820 Translated using Weblate (Korean) 
Currently translated at 79.7% (2575 of 3230 strings)

[CI skip]
 2016-11-03 20:09:43 +01:00
Jørgen Thomsen
2ff8b909db Translated using Weblate (Danish) 
Currently translated at 95.3% (3081 of 3230 strings)

[CI skip]
 2016-11-03 20:09:41 +01:00
Weblate
c79b18c2b5 Merge remote-tracking branch 'origin/master' 2016-11-02 16:59:44 +01:00
Deven Bansod
e7930b23b3 Show Language choosing option only if more than 1 available languages 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-02 21:31:15 +05:30
Jørgen Thomsen
00320bae3f Translated using Weblate (Danish) 
Currently translated at 94.0% (3039 of 3230 strings)

[CI skip]
 2016-11-02 16:59:40 +01:00
Deven Bansod
9be7c55bd0 Allow for proper MySQL-allowed strings as identifiers 
Fix #12674

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-01 21:20:13 +05:30
Deven Bansod
e2dac31bdb Refactor the language selector display into a template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-31 09:02:59 +05:30
Deven Bansod
03fd02ad50 Merge branch 'QA_4_6' 2016-10-30 14:50:12 +05:30
Deven Bansod
8556b5d4bf ChangeLog for #12665 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-30 14:49:41 +05:30
Deven Bansod
1475c0e811 Allow Foreign keys to be added on non-indexed columns, if it's an InnoDB table 
InnoDB automatically creates an index over the column, which can be replaced
by defining a new index over the same column.

Fix #12665

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-30 13:39:02 +05:30
Deven Bansod
d73bf36ff7 Merge branch 'QA_4_6' 2016-10-28 13:13:52 +05:30
Deven Bansod
2fbf09ba2d ChangeLog for #12195 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:12:43 +05:30
Deven Bansod
3e9c30a561 Document prevention of errors with import of ROW_FORMAT=fixed in newer MySQL versions 
See https://github.com/phpmyadmin/phpmyadmin/issues/12195#issuecomment-256849353

Fix #12195

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:08:17 +05:30
Deven Bansod
24aee3758d Merge branch 'QA_4_6' 2016-10-27 17:02:41 +05:30
Deven Bansod
368b74bad6 ChangeLog for #12661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 17:02:02 +05:30
Deven Bansod
c5d3b0bbb0 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-27 16:54:04 +05:30
Deven Bansod
e4fe53217e Try adding query to history only if Database links are available 
Fix #12661

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 16:52:40 +05:30
Michal Čihař
e8946e4824 Merge branch 'QA_4_6' 2016-10-27 11:37:10 +02:00
Stefano Martinelli
6555f23db6 Translated using Weblate (Italian) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-27 11:36:42 +02:00
Stefano Martinelli
077a79b5ce Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 11:36:18 +02:00
Stefano Martinelli
e0195f1928 Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 10:33:31 +02:00