gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,773 Commits 12 Branches 481 Tags 2.4 GiB
28bfcebcf1
Commit Graph

105773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
28bfcebcf1 Remove potentionally license problematic sRGB profile 
We really do not need it, so there is no reason to ship it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 09:04:26 +02:00
Isaac Bennetch
b3d8ebad3f Prepare for 4.6.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 21:35:34 -04:00
Weblate
0c3dac812c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-17 03:35:10 +02:00
Axel Rindle
bd403cdbd2 Translated using Weblate (German) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-17 03:35:08 +02:00
Isaac Bennetch
b9a6a9993e Release 4.6.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 16:38:46 -04:00
Isaac Bennetch
0f6b76b578 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2016-08-16 16:34:37 -04:00
Weblate
13d341530b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-14 18:13:09 +02:00
Burak Yavuz
ec6b67e903 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-08-14 18:13:08 +02:00
Dadan Setia
91a548811d Translated using Weblate (Indonesian) 
Currently translated at 68.9% (2216 of 3213 strings)

[CI skip]
 2016-08-14 18:13:07 +02:00
Deven Bansod
9fe4cbe994 Allow resizing only from bottom of the SQL Editors 
Also affects SQL Editors in Inline editing, Add/Edit Routines,
Exporting User privileges etc.

ChangeLog Entry for #12346

Fix #12346

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-14 21:41:24 +05:30
Alex Vega
16c9eee917 Translated using Weblate (Russian) 
Currently translated at 97.5% (3135 of 3213 strings)

[CI skip]
 2016-08-14 03:45:53 +02:00
Deven Bansod
90df9c9883 ChangeLog entry for #12375 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-10 01:02:53 +05:30
Deven Bansod
6c8513bd79 Merge pull request #12450 from devenbansod/fix_12375 
Scroll (using Animate) only when result div is loaded with data from ajax response and is visible
 2016-08-10 00:59:47 +05:30
Deven Bansod
e80b477525 Scroll (using Animate) only when result div is visible 
We load the result div using data from AJAX request and make the div visible.
So, we should scroll down when the div is visible and loaded with the appropriate data.

Fix #12375

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 19:05:34 +05:30
Michal Čihař
3dcb219834 Simplify markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 15:08:46 +02:00
Michal Čihař
aadee00209 Document signing key for themes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 15:08:23 +02:00
Michal Čihař
12a66952a9 Use long key IDs or fingerprints to point to keys 
This is safer than short IDs, where colliscion could exist.

Fixes #12448

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 14:34:25 +02:00
Michal Čihař
6deff4131c Document docker configuration customization 
See https://github.com/phpmyadmin/docker/pull/42

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 14:31:11 +02:00
Παναγιώτης Παπάζογλου
cb4a8eef4f Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-08 14:30:36 +02:00
Cédric Corazza
9824a3d62c Translated using Weblate (French) 
Currently translated at 99.8% (3209 of 3214 strings)

[CI skip]
 2016-08-08 14:30:35 +02:00
Juha Remes
c3158f466e Translated using Weblate (Finnish) 
Currently translated at 69.1% (2222 of 3213 strings)

[CI skip]
 2016-08-06 21:44:36 +02:00
Massimiliano Caniparoli
011cfb6e0e Translated using Weblate (Italian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-06 18:45:02 +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
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ř
208480237d Remove unused function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-04 08:15:48 +02:00
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ř
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ř
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ř
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ř
2ec1f50d45 Merge branch 'QA_4_6' into QA_4_6-security 2016-08-03 10:03:05 +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
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ř
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
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ř
e7d4ef2fbc Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 09:16:03 +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ř
1af9db6baf Changelog for issue #12422 - Improvements to the original theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:57:02 +02:00
Michal Čihař
aa427068ec Merge pull request #12422 from rpv-tomsk/fix-notices-original-theme 
Improved indents, alignment and rtl in Original theme
 2016-08-02 08:56:21 +02:00
Michal Čihař
ae79ceb3a4 Do not error on unset server port 
Fixes #12339

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:53:06 +02:00
Michal Čihař
493ece49ee Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:45:16 +02:00
Michal Čihař
77d5a1e07c Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-02 08:43:51 +02:00