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

113015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ssantos
0e4c97afe0 Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-04-25 21:00:20 +02:00
Maurício Meneghini Fauth
d921ab0abb Merge branch 'QA_4_8' 2018-04-24 14:19:43 -03:00
Maurício Meneghini Fauth
bb8a003cba Add ChangeLog entry for #14049 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-24 14:18:21 -03:00
Aswani Prakash
51bb359122 #14049 issue fix Query builder doesn't work when the selected column is * 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 5f3f48446c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-24 14:15:50 -03:00
Maurício Meneghini Fauth
15a3488cb7
Merge pull request #14228 from aswaniprakash/PMA_iss14049 
Fix #14049 issue Query builder doesn't work when the selected column …
 2018-04-24 14:10:34 -03:00
Maurício Meneghini Fauth
98582064f6 Merge branch 'QA_4_8' 2018-04-24 13:44:13 -03:00
Maurício Meneghini Fauth
69ec56ad34 Add ChangeLog entry for #12772 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-24 13:39:47 -03:00
Aswani Prakash
17099186be #12772 issue central column attributes don't get filled in 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 95867b18fa)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-24 13:18:42 -03:00
Maurício Meneghini Fauth
e8c519458a
Merge pull request #14226 from aswaniprakash/PMA_iss12772 
Fix #12772 issue central column attributes don't get filled in
 2018-04-24 13:10:37 -03:00
Yaron Shahrabani
b7c5a5dcb5 Translated using Weblate (Hebrew) 
Currently translated at 31.3% (1031 of 3288 strings)

[CI skip]
 2018-04-24 15:37:50 +02:00
Aswani Prakash
5f3f48446c #14049 issue fix Query builder doesn't work when the selected column is * 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-04-24 10:26:01 +05:30
Aswani Prakash
95867b18fa #12772 issue central column attributes don't get filled in 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-04-24 10:13:35 +05:30
Maurício Meneghini Fauth
374b2379ad
Merge pull request #14179 from rijaspk/master 
Remove Inline Styles from Ruotines.php
 2018-04-24 00:47:33 -03:00
Maurício Meneghini Fauth
1f133bcff1
Merge pull request #14137 from shucon/dgn_bound 
Tables stop at border
 2018-04-23 22:49:28 -03:00
Weblate
9645656670 Merge remote-tracking branch 'origin/master' 2018-04-24 00:57:03 +02:00
Yaron Shahrabani
29cbbe7d1e Translated using Weblate (Hebrew) 
Currently translated at 31.3% (1031 of 3288 strings)

[CI skip]
 2018-04-24 00:57:00 +02:00
Maurício Meneghini Fauth
12247e9b6f
Merge pull request #14224 from carusogabriel/array-key-exists 
Use array_key_exists instead of in_array + array_keys
 2018-04-23 19:56:48 -03:00
Gabriel Caruso
c1786eee96
Use array_key_exists instead of in_array + array_keys 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-04-22 22:39:55 -03:00
Pyscowicz
8739429a28 Translated using Weblate (Finnish) 
Currently translated at 66.6% (2191 of 3288 strings)

[CI skip]
 2018-04-21 10:37:09 +02:00
Pyscowicz
36d7cac686 Translated using Weblate (Finnish) 
Currently translated at 66.6% (2191 of 3288 strings)

[CI skip]
 2018-04-21 10:36:59 +02:00
Isaac Bennetch
2efd1a3e46 Release documentation: encourage signing Docker releases 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 10:22:35 -04:00
Isaac Bennetch
58ed8a75c6 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 10:10:13 -04:00
Isaac Bennetch
312274300d Merge commit 'b04e4ccbfd' 2018-04-19 10:09:12 -04:00
Isaac Bennetch
feda69b465 Merge commit 'b2c79ae39f' 2018-04-19 10:09:00 -04:00
Isaac Bennetch
fc5992686e Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 10:06:27 -04:00
Weblate
fbe93e63c0 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-04-19 16:01:18 +02:00
S.C. MEGAHOST S.R.L
8ea45f29b9 Translated using Weblate (Romanian) 
Currently translated at 0.0% (0 of 3288 strings)

[CI skip]
 2018-04-19 16:01:16 +02:00
Isaac Bennetch
2cc861f0a3 Prepare for 4.8.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:57:10 -04:00
Isaac Bennetch
a26644de5a Merge branch 'MAINT_4_8_0' into QA_4_8 2018-04-19 09:56:54 -04:00
Isaac Bennetch
e492cca492 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:22:36 -04:00
Isaac Bennetch
81fb6f7562 Adding composer lock for 4.8.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:10:51 -04:00
Isaac Bennetch
236b5c9332 Prepare for version 4.8.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:06:13 -04:00
“Rijas
01692acc72 Remove Inline Styles from Ruotines.php 
Signed-off-by: Rijas Ahammed PK <rijaspk5195@gmail.com>
 2018-04-19 14:25:31 +05:30
Maurício Meneghini Fauth
ea5c066d5d
Merge pull request #14208 from CommanderRoot/patch-1 
Fix errors due to undefined variables
 2018-04-19 03:54:44 -03:00
Isaac Bennetch
b04e4ccbfd
Merge pull request #241 from phpmyadmin/bug240 
Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities
 2018-04-19 01:00:27 -04:00
Weblate
8f32791b87 Merge remote-tracking branch 'origin/master' 2018-04-19 04:06:12 +02:00
S.C. MEGAHOST S.R.L
9920882cd5 Translated using Weblate (Romanian) 
Currently translated at 0.0% (0 of 3288 strings)

[CI skip]
 2018-04-19 04:06:11 +02:00
Maurício Meneghini Fauth
e64c50aff8 Fix "undefined index" notices in common.inc.php 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-18 23:01:19 -03:00
CommanderRoot
ceed1d6459
Fix errors due to undefined variables 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2018-04-18 20:07:36 +02:00
S.C. MEGAHOST S.R.L
b2c79ae39f Translated using Weblate (Romanian) 
Currently translated at 50.9% (1675 of 3288 strings)

[CI skip]
 2018-04-18 16:41:03 +02:00
Michal Čihař
2cde3122a3 Merge branch 'QA_4_8' 2018-04-18 16:22:08 +02:00
S.C. MEGAHOST S.R.L
328776a188 Translated using Weblate (Romanian) 
Currently translated at 50.9% (1676 of 3288 strings)

[CI skip]
 2018-04-18 16:20:21 +02:00
S.C. MEGAHOST S.R.L
14e19456fe Translated using Weblate (Romanian) 
Currently translated at 50.9% (1676 of 3288 strings)

[CI skip]
 2018-04-18 16:20:15 +02:00
Michal Čihař
0faa940bae Add missing espacing to sed regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-04-18 15:45:19 +02:00
Michal Čihař
66e4c3de68 Make create-release script compatible with QA_4_8 
The version in master is supposed to handle all supported branches.

See https://github.com/phpmyadmin/docker/issues/157

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-04-18 15:43:12 +02:00
Maurício Meneghini Fauth
3c85d747b4 Add type declarations to Core 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-18 00:41:57 -03:00
Maurício Meneghini Fauth
2e591046cf Add type declarations to Console 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-17 22:50:05 -03:00
Maurício Meneghini Fauth
af3b424ce6 Add type declarations for Config 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-17 22:41:37 -03:00
Maurício Meneghini Fauth
38f06caeac Replace var keyword with public in Config 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-17 21:59:56 -03:00
Maurício Meneghini Fauth
ed765042d3 Add type declarations for CheckUserPrivileges 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-17 21:49:21 -03:00