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

106904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c1df7a9a0d Merge branch 'QA_4_6' 2016-08-17 10:40:19 +02:00
Michal Čihař
27f4ff93ee Document how to set up credentials on Docker 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 10:40:13 +02:00
Michal Čihař
78a93d5a41 Revert "Strip barcodes from TCPDF" 
This reverts commit e7517f5144.
 2016-08-17 09:59:15 +02:00
Michal Čihař
08e6e8ca07 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-08-17 09:10:21 +02:00
Michal Čihař
e7517f5144 Strip barcodes from TCPDF 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 09:06:10 +02:00
Michal Čihař
f189f3a08f Remove sRGB.icc when creating release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 09:05:26 +02:00
Michal Čihař
8b295ee841 Merge branch 'QA_4_6' 2016-08-17 09:04:45 +02:00
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
Weblate
b156313c09 Merge remote-tracking branch 'origin/master' 2016-08-17 08:53:21 +02:00
Axel Rindle
f5fd7c8a4f Translated using Weblate (German) 
Currently translated at 99.5% (3202 of 3217 strings)

[CI skip]
 2016-08-17 08:53:19 +02:00
Michal Čihař
ee7bfa7601 Merge branch 'QA_4_6' 2016-08-17 08:52:44 +02:00
Michal Čihař
8c9ed41bad Merge commit '0c3dac812ce739a96d554fbb4a20b37418255fc8' 2016-08-17 08:52:09 +02:00
Michal Čihař
e1952a5eef Merge commit 'b9a6a9993e175ff13375462333ce1139095d01e1' 2016-08-17 08:51:53 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +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
Michal Čihař
26c0961df6 Merge pull request #12460 from rpv-tomsk/revert-12274 
Revert #12274
 2016-08-16 16:44:04 +02:00
Pavel Rochnyack
c274f193a1 Revert "fixed checking of user rights to make it look for database privileges" 
This reverts commit df137f2410.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 18:14:34 +01:00
Deven Bansod
9ee52d84f2 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/ru.po
 2016-08-14 21:47:00 +05:30
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
Deven Bansod
8d57d860e1 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-08-14 11:24:46 +05:30
Deven Bansod
06f584780c ChangeLog for #12162 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-14 11:24:07 +05:30
Weblate
639a7285c3 Merge remote-tracking branch 'origin/master' 2016-08-14 07:53:04 +02:00
Burak Yavuz
76573d7fed Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-14 07:53:04 +02:00
Dadan Setia
3498c14519 Translated using Weblate (Indonesian) 
Currently translated at 68.5% (2206 of 3216 strings)

[CI skip]
 2016-08-14 07:53:02 +02:00
Deven Bansod
11b3f1f1b2 Merge pull request #12449 from devenbansod/show_tbl_charset_on_DbStructure 
Add optional column 'Charset' on Database structure page
 2016-08-14 11:22:54 +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
Alex Vega
58d27d81fe Translated using Weblate (Russian) 
Currently translated at 96.9% (3120 of 3217 strings)

[CI skip]
 2016-08-14 03:45:44 +02:00
Deven Bansod
43dc116769 Merge branch 'QA_4_6' 2016-08-10 01:03:08 +05:30
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
a9f0002f8f Merge branch 'QA_4_6' 2016-08-10 01:00:55 +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ř
eec4856cb4 Merge branch 'QA_4_6' 2016-08-08 15:08:53 +02:00
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
Deven Bansod
7f80d3f78a Remove trailing whitespace 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 18:33:32 +05:30
Michal Čihař
2876871dd7 Merge branch 'QA_4_6' 2016-08-08 14:35:32 +02:00
Michal Čihař
1a3a9179bb Merge commit 'cb4a8eef4fac780af1c55668b9f706bc547c22be' 2016-08-08 14:35:30 +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
Deven Bansod
315f7b3596 Add optional column 'Charset' on Database structure page 
Fix #12162

Add an option to add a Column on Database structure page which shows the charset of each table/view

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 17:51:16 +05:30