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

106951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
5072d9a0df Merge remote-tracking branch 'origin/QA_4_6' 2016-08-17 15:40:15 +02:00
Michal Čihař
23b34b1880 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-08-17 15:40:04 +02:00
Weblate
df5099459d Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-17 15:38:55 +02:00
Stefano Martinelli
9d3263c9f3 Translated using Weblate (Italian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-17 15:38:53 +02:00
dingo thirteen
a02f9c6ad0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-17 15:38:52 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
07985b5ef2 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-17 15:38:19 +02:00
Michal Čihař
7898060916 Ensure PmaAbsoluteUri ends with / 
This was probably most frequest user error we want to fix.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:37:20 +02:00
Michal Čihař
f6a64ed835 Reintroduced simplified PmaAbsoluteUri configuration directive 
Fixes #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
a458b70412 Use PmaAbsoluteUri for isHttps 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
01b9db6b1c Rename getCookiePath() to getRootPath() 
It is not used only for cookies, so generic name makes more sense.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
83476322ba Use PmaAbsolueUri for cookie path 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
1099f68c1a Reintroduce PmaAbsoluteUri setting 
It has no affect yet.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:14:46 +02:00
Michal Čihař
b53fff29b2 Crossreference docs for PmaAbsoluteUri 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 14:44:21 +02:00
Michal Čihař
76a471a790 Avoid problems with PHP comparison 
- allow password where empty returns true
- compare using ===

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 13:18:45 +02:00
Michal Čihař
311be7515c Use https when available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 13:17:41 +02:00
Michal Čihař
84d5c028b2 Changelog for issue #12330 
Shortcut for closing console

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 13:07:41 +02:00
Michal Čihař
740fb742ca Merge pull request #12333 from Achilles-96/Issue-12330 
Fixes #12330 - Shortcut for closing console
 2016-08-17 13:07:06 +02:00
Weblate
f22b1e8bbb Merge remote-tracking branch 'origin/master' 2016-08-17 12:34:11 +02:00
Burak Yavuz
f5adc8403d Translated using Weblate (Turkish) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-08-17 12:34:10 +02:00
Kristjan Räts
709a999035 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-08-17 12:34:08 +02:00
dingo thirteen
0ff3b018ad Translated using Weblate (Dutch) 
Currently translated at 99.9% (3216 of 3219 strings)

[CI skip]
 2016-08-17 12:34:07 +02:00
Kristjan Räts
41613c512d Translated using Weblate (Estonian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-17 12:25:59 +02:00
Stefano Martinelli
5898e19e73 Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-08-17 12:20:59 +02:00
Burak Yavuz
5410e3859b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-17 12:18:45 +02:00
Michal Čihař
8f74b63430 Merge branch 'QA_4_6' 2016-08-17 11:39:06 +02:00
Michal Čihař
1d3608b6a9 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-17 11:38:57 +02:00
Michal Čihař
9642fc2a64 Merge branch 'QA_4_6' 2016-08-17 11:38:46 +02:00
Michal Čihař
27936aa8bf Changelog entry for issue #12430 
Impove partitioning support

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 11:38:29 +02:00
Michal Čihař
ba59178a75 Merge pull request #12430 from rpv-tomsk/improve-partitions-support 
Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support.
 2016-08-17 11:37:44 +02:00
Michal Čihař
07ea338e4f Merge branch 'QA_4_6' 2016-08-17 11:29:39 +02:00
Michal Čihař
fa60ccfca0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 11:29:26 +02:00
Michal Čihař
5c1cdeb67c Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 11:28:41 +02:00
Michal Čihař
71b5d662d2 Merge branch 'QA_4_6' 2016-08-17 11:27:59 +02:00
Michal Čihař
03461d85c8 Merge pull request #12458 from rpv-tomsk/fix-ru-translation 
Translation improvements
 2016-08-17 11:23:46 +02:00
Michal Čihař
d3222bd925 Merge branch 'QA_4_6' 2016-08-17 11:22:07 +02:00
Michal Čihař
7412f90aaf Add changelog entries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 11:21:38 +02:00
Michal Čihař
a53bc7c0e3 Merge pull request #12459 from rpv-tomsk/column-privileges 
When editing table records, display readonly inputs for fields without write access.
 2016-08-17 11:20:14 +02:00
Michal Čihař
cff9e555ae Merge pull request #12462 from devenbansod/fix_12384 
Reload Navigation if no previous entry stored
 2016-08-17 11:16:25 +02:00
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