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

112907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
e6cc4fbbbc Fix #14264 Linking for 'Distinct values' broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-08 07:10:06 +10:00
Maurício Meneghini Fauth
b36c295c89 Remove homebrew/php from Travis CI 
homebrew/php was migrated to homebrew/core

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 86adefd460)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 22:46:56 -03:00
Maurício Meneghini Fauth
c34484a739 Fix TableCreateTest::testCreateTable Selenium test 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit e548d0802b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 22:15:27 -03:00
Weblate
a6814842a5 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-07 02:18:37 +02:00
Edward FANG
179006a1d8 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.9% (2761 of 3288 strings)

[CI skip]
 2018-05-07 02:18:34 +02:00
Maurício Meneghini Fauth
4ee541a000 Add ChangeLog entry for #14260 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:17:50 -03:00
William Desportes
8f571f7e9e #14260 Fixed configuration for DefaultLang and Lang 
Closes: #14260
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 2f84b4034e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:16:36 -03:00
Madhura Jayaratne
7b27484897 Fix #14239 Line and some other charts ignore result set order of values chosen for the x-axis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-06 08:59:06 +10:00
William Desportes
0d2f70c875 Patch for #14257 CodeMirror hints hidden 
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 24f483793c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 23:39:17 -03:00
Maurício Meneghini Fauth
ea1e3a2578 Add ChangeLog entry for #14212 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:46:45 -03:00
Piyush Vijay
b02220241f XML Export from single table throws fatal error (PHP 7.2): #14212 issue fixed 
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

(cherry picked from commit 5b35dba67d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:44:41 -03:00
Maurício Meneghini Fauth
441321a123 Add ChangeLog entry for #14128 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:48:59 -03:00
Weblate
808e22fbf9 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-03 18:42:41 +02:00
Yaron Shahrabani
ddc8e8c497 Translated using Weblate (Hebrew) 
Currently translated at 38.2% (1259 of 3288 strings)

[CI skip]
 2018-05-03 18:42:41 +02:00
Maurício Meneghini Fauth
e7a6ff8a0e Remove duplicated input in application_configure.twig 
Some coding style fixes.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:40:33 -03:00
Raman Tehlan
3054999afe Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 8dbae11f6f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:28:52 -03:00
William Desportes
8af0343bb2 Patch for issue #14246 
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-05-02 12:13:49 +02:00
Yaron Shahrabani
f5524eaa6c Translated using Weblate (Hebrew) 
Currently translated at 38.1% (1255 of 3288 strings)

[CI skip]
 2018-05-01 14:38:16 +02:00
Giovanni Sora
cd9117d0bb Translated using Weblate (Interlingua) 
Currently translated at 75.3% (2479 of 3288 strings)

[CI skip]
 2018-04-30 19:37:43 +02:00
Madhura Jayaratne
151976aa61 Merge branch 'QA_4_8' of github.com:phpmyadmin/phpmyadmin into QA_4_8 2018-04-30 00:37:14 +10:00
Madhura Jayaratne
5872167dc2 Fix #14227 Relational linking broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-04-30 00:36:03 +10:00
Weblate
48f89e583b Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-04-29 15:54:49 +02:00
Dadan Setia
bf08749f9e Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-04-29 15:54:46 +02:00
Yaron Shahrabani
497b14411b Translated using Weblate (Hebrew) 
Currently translated at 33.8% (1114 of 3288 strings)

[CI skip]
 2018-04-29 15:54:44 +02:00
ssantos
1bbedee153 Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-04-29 15:54:42 +02:00
Madhura Jayaratne
49e2a98158 Fix #14241 Dropping indexes and foreign keys fail 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-04-29 23:54:28 +10:00
Allan Nordhøy
a568708411 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.8% (1836 of 3288 strings)

[CI skip]
 2018-04-28 21:39:45 +02:00
Yaron Shahrabani
0f6c5325c2 Translated using Weblate (Hebrew) 
Currently translated at 33.8% (1112 of 3288 strings)

[CI skip]
 2018-04-27 17:37:32 +02:00
Dadan Setia
87607d908e Translated using Weblate (Indonesian) 
Currently translated at 81.1% (2668 of 3288 strings)

[CI skip]
 2018-04-27 16:38:06 +02:00
Maurício Meneghini Fauth
f44fbc6349 Add ChangeLog entry for #14029 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-25 17:44:27 -03:00
Weblate
b7ea8688b0 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-04-25 20:59:23 +02:00
Yaron Shahrabani
2bc2ed4f1d Translated using Weblate (Hebrew) 
Currently translated at 33.3% (1097 of 3288 strings)

[CI skip]
 2018-04-25 20:59:22 +02:00
ssantos
03a7fbff33 Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-04-25 20:59:13 +02:00
Maurício Meneghini Fauth
97547e8e16 Revert "Fix table horizontal scrolling (#14001)" 
This reverts commit e92b357210.

This fixes #14193, fixes #14029, fixes #14199, fixes #14102 and fixes #14232

This closes #14196 and closes #14206

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-25 15:53:19 -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
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
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
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
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
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
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
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