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

106684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Παναγιώτης Παπάζογλου
3581d4a758 Translated using Weblate (Greek) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-08 13:37:17 +02:00
Weblate
2bb9472ad8 Merge remote-tracking branch 'origin/master' 2016-08-08 13:26:46 +02:00
Cédric Corazza
298768b646 Translated using Weblate (French) 
Currently translated at 99.3% (3196 of 3217 strings)

[CI skip]
 2016-08-08 13:26:43 +02:00
Michal Čihař
e601c7fff1 Document docker configuration customization 
See https://github.com/phpmyadmin/docker/pull/42

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 13:26:17 +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
Weblate
353ee08c17 Merge remote-tracking branch 'origin/master' 2016-08-05 11:25:19 +02:00
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ř
adcb028db9 Create codecov.yml 
Configuration for codecov
 2016-08-05 11:25:09 +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