Commit Graph

106652 Commits

Author SHA1 Message Date
Massimiliano Caniparoli
a531bb3682 Translated using Weblate (Italian)
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
2016-08-05 11:25:17 +02:00
Juha Remes
45672c58c4 Translated using Weblate (Finnish)
Currently translated at 68.8% (2214 of 3216 strings)

[CI skip]
2016-08-05 11:25:15 +02:00
Michal Čihař
5438bb7d55 Switch to new codecov client
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-04 15:51:41 +02:00
Deven Bansod
f3237c9fa4 Merge branch 'QA_4_6' 2016-08-04 09:24:16 +05:30
Michal Čihař
0172751bf6 Merge branch 'QA_4_6' 2016-08-04 09:20:52 +02:00
Michal Čihař
4c2c562204 Suggest more secure Apache configuration
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-04 09:20:48 +02:00
Michal Čihař
c9e5f6ff1b Merge branch 'QA_4_6' 2016-08-04 08:16:43 +02:00
Michal Čihař
208480237d Remove unused function
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-04 08:15:48 +02:00
Deven Bansod
39425f2a4c ChangeLog entry for #12433
Signed-off-by: Deven Bansod <deven@localhost.localdomain>
2016-08-04 09:23:09 +05:30
Deven Bansod
e3f73805f0 Merge pull request #12441 from devenbansod/fix_12433
Fix #12433 : Copy table with prefix does not copy the indexes
2016-08-04 14:51:06 +05:30
Deven Bansod
f6f3002d33 Fix #12433 : Copy table with prefix does not copy the indexes
Change the query "CREATE TABLE $newtablename SELECT * FROM $old" to using Table::moveCopy

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-08-03 16:43:24 +05:30
Michal Čihař
4da9da052b Safer ssh configuration
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 11:48:53 +02:00
Michal Čihař
652cfe0b2d Merge branch 'QA_4_6' 2016-08-03 11:37:14 +02:00
Michal Čihař
d09e5438c1 Remove unsued code for generating events
This is no longer used, so there is no need to support it.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 11:36:41 +02:00
Michal Čihař
7b3231352d Use links when talking about phpmyadmin.net
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 11:26:26 +02:00
Michal Čihař
ce9914e35d Use https for link
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 11:05:49 +02:00
Michal Čihař
d5139a52d9 Merge branch 'QA_4_6' 2016-08-03 10:59:33 +02:00
Michal Čihař
a294026e37 Simplified getting error from preg_match
It's enough to use error_get_last to obtain the message without need to
play with PHP configuration and error handling.

The only tricky thing is to know that there is new error. With PHP 7,
there is error_clear_last() which ensures this, on older PHP we need to
trigger *another* error to be able to detect that new error comes.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 10:54:40 +02:00
Michal Čihař
88b817a042 Merge branch 'QA_4_6' 2016-08-03 10:27:54 +02:00
Michal Čihař
91ff2a97e2 Open demo information in new tab
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 10:27:49 +02:00
Michal Čihař
3aa380a1e1 Merge branch 'QA_4_6' 2016-08-03 10:02:53 +02:00
Michal Čihař
7823e39013 Merge commit '1816bb0d2ce571a8c353c8ba5d88958917a97bf6' 2016-08-03 10:02:45 +02:00
Michal Čihař
5385099b40 Changelog for issue #12423
Fixed replication status in database listing

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 10:01:44 +02:00
Michal Čihař
f6d1c90188 Merge pull request #12423 from rpv-tomsk/fix-replication-status
Fix replication status output in database tables list.
2016-08-03 10:01:03 +02:00
Weblate
0bb57c9465 Merge remote-tracking branch 'origin/master' 2016-08-03 06:43:49 +02:00
Belkacem Mohammed
d3a8bf84c8 Translated using Weblate (Kabyle)
Currently translated at 0.3% (11 of 3217 strings)

[CI skip]
2016-08-03 06:43:48 +02:00
Masahiro Nishi
db4ab0134c Translated using Weblate (Japanese)
Currently translated at 69.9% (2248 of 3216 strings)

[CI skip]
2016-08-03 06:43:48 +02:00
Deven Bansod
e285b95c42 Merge branch 'QA_4_6' 2016-08-03 10:13:17 +05:30
Weblate
1816bb0d2c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-03 06:42:43 +02:00
Masahiro Nishi
7b17fe8cef Translated using Weblate (Japanese)
Currently translated at 70.3% (2259 of 3213 strings)

[CI skip]
2016-08-03 06:42:42 +02:00
Deven Bansod
88a1c7e1fa Merge branch 'QA_4_6' of http://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-08-03 10:12:11 +05:30
Deven Bansod
369c53aee3 Fix Label's 'for' attribute for Auto-incr in Copy Mutliple tables
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-08-03 10:10:50 +05:30
Michal Čihař
957e2d0b11 Merge branch 'QA_4_6' 2016-08-02 15:14:54 +02:00
Michal Čihař
5331315c22 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-02 15:14:48 +02:00
Stefano Martinelli
ef55abd661 Translated using Weblate (Italian)
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
2016-08-02 15:13:56 +02:00
Giovanni Sora
ad1919fb50 Translated using Weblate (Interlingua)
Currently translated at 73.6% (2370 of 3217 strings)

[CI skip]
2016-08-02 15:13:55 +02:00
Kristjan Räts
79768b7c32 Translated using Weblate (Estonian)
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
2016-08-02 15:13:54 +02:00
dingo thirteen
6976123e55 Translated using Weblate (Dutch)
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
2016-08-02 15:13:54 +02:00
Michal Čihař
bb9317d192 Do not try to load old transformation plugins
Fixes #12395

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-02 15:13:07 +02:00
dingo thirteen
ae2f9d125c Translated using Weblate (Dutch)
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
2016-08-02 15:12:56 +02:00
Kristjan Räts
8eb46799ca Translated using Weblate (Estonian)
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
2016-08-02 15:01:43 +02:00
dingo thirteen
34d028a3d5 Translated using Weblate (Dutch)
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
2016-08-02 12:27:59 +02:00
Stefano Martinelli
1d25a84920 Translated using Weblate (Italian)
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
2016-08-02 10:24:45 +02:00
Stefano Martinelli
a897d5c710 Translated using Weblate (Italian)
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
2016-08-02 10:17:05 +02:00
Michal Čihař
1de346b3fe Store composer.lock in Git for releases
Once release is created, commit composer.lock to releasing branch, so
that we know what has been shipped there.

Fixes #12408

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-02 09:23:40 +02:00
Michal Čihař
2995dc5b23 Merge branch 'QA_4_6' 2016-08-02 09:15:31 +02:00
Michal Čihař
6bfde0908d Merge pull request #12417 from Newman101/patch-1
credits.rst - Finnish language (missing surname)
2016-08-02 09:02:54 +02:00
Michal Čihař
07a4316bf5 Merge remote-tracking branch 'origin/pull/12420' into QA_4_6 2016-08-02 09:00:20 +02:00
Michal Čihař
f9563d6fcc Merge pull request #12421 from rpv-tomsk/fix-ru-translation
Translation improvements
2016-08-02 08:58:40 +02:00
Michal Čihař
21a9bbea9f Merge branch 'QA_4_6' 2016-08-02 08:57:17 +02:00