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

113165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
74df5cef53
Merge pull request #14263 from nulll-pointer/view_alter_error 
Fix for missing go button in view edit, #14249
 2018-05-08 23:12:46 -03:00
Weblate
6d1bf42c0a Merge remote-tracking branch 'origin/master' 2018-05-08 22:47:49 +02:00
Yaron Shahrabani
5bde08d130 Translated using Weblate (Hebrew) 
Currently translated at 40.1% (1320 of 3291 strings)

[CI skip]
 2018-05-08 22:47:48 +02:00
Maurício Meneghini Fauth
b87f5ed0fa
Merge pull request #14267 from BackEndTea/patch-1 
Require a polyfill instead of the cytpe extension
 2018-05-08 17:47:37 -03:00
ssantos
1142c64b08 Translated using Weblate (German) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-08 17:19:17 +02:00
Gert de Pagter
f7ef36b595
Require a polyfill instead of the cytpe extension 
Ctype is an indirect dependency due to twig,  and it isn't resolved there until a later version than we require.
By requiring the symfony polyfill for cytpe everything will still run, regardless of the ctype availability. 

Twig will require this polyfill itself in a later version, but this makes sure we still allow earlier versions of twig to be used.

Signed-off-by: Gert de Pagter <BackEndTea@gmail.com>
 2018-05-08 16:32:48 +02:00
Maurício Meneghini Fauth
dc72341b75 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:44:19 -03:00
Maurício Meneghini Fauth
de250fbae3 Fix MariaDB 10.2 current_timestamp() 
Fixes #13968 and fixes #13999. Closes #14177.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:39:53 -03:00
Weblate
8a510a2dd3 Merge remote-tracking branch 'origin/master' 2018-05-07 23:11:58 +02:00
Yaron Shahrabani
7f0a086bfd Translated using Weblate (Hebrew) 
Currently translated at 39.9% (1314 of 3291 strings)

[CI skip]
 2018-05-07 23:11:52 +02:00
Alpix
f88e6c0449 Translated using Weblate (German) 
Currently translated at 99.9% (3288 of 3291 strings)

[CI skip]
 2018-05-07 23:11:46 +02:00
Madhura Jayaratne
d564bf275f Merge branch 'QA_4_8' 2018-05-08 07:11:44 +10:00
Weblate
efb51ae3f3 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-07 23:10:29 +02:00
Yaron Shahrabani
6aaaf1065b Translated using Weblate (Hebrew) 
Currently translated at 39.9% (1313 of 3288 strings)

[CI skip]
 2018-05-07 23:10:24 +02:00
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
Lakshay arora
3641a6521e Fix for missing go button in view edit, #14249 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-05-08 01:13:00 +05:30
Burak Yavuz
744408e72b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 11:54:35 +02:00
Olivier Humbert
3d7cb69ef1 Translated using Weblate (French) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 10:11:25 +02:00
dingo thirteen
b3e0342a48 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 09:14:44 +02:00
Maurício Meneghini Fauth
358fbf5b21 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 03:27:57 -03:00
Maurício Meneghini Fauth
3e8d461ba3 Add type declarations to Export 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 03:18:12 -03:00
Maurício Meneghini Fauth
675be84d97 Add type declarations to ErrorReport 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 02:08:55 -03: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
Maurício Meneghini Fauth
12e24ee4db Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:20:01 -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
Weblate
7df655f2c9 Merge remote-tracking branch 'origin/master' 2018-05-07 02:13:12 +02:00
Edward FANG
b2d5d7e456 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.9% (2759 of 3288 strings)

[CI skip]
 2018-05-07 02:13:10 +02:00
Maurício Meneghini Fauth
923157d0a6
Merge pull request #14261 from williamdes/issue-14260-langs-cfg 
#14260 Fixed configuration for DefaultLang and Lang
 2018-05-06 21:13:02 -03:00
William Desportes
2f84b4034e
#14260 Fixed configuration for DefaultLang and Lang 
Closes: #14260
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-07 01:03:15 +02:00
Madhura Jayaratne
bb9fc5d6e9 Merge branch 'QA_4_8' 2018-05-06 09:00:52 +10: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
29115645f3
Merge pull request #14258 from williamdes/issue-14257-codemirror-hints 
Patch for #14257 CodeMirror hints hidden
 2018-05-04 23:28:43 -03:00
William Desportes
24f483793c
Patch for #14257 CodeMirror hints hidden 
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-04 12:07:34 +02:00
Maurício Meneghini Fauth
0c3d024e3e Add ChangeLog entries for #12373 and #14155 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 04:39:03 -03:00
Maurício Meneghini Fauth
bee5672d8c Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:51:33 -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
2f824e5508
Merge pull request #14216 from Piyush3079/PMA_14212 
Fix XML Export fatal error and add Move columns preview SQL
 2018-05-04 02:40:54 -03:00
Maurício Meneghini Fauth
dcb2aec958
Merge pull request #14255 from laps15/templates 
Addapt getTableHeader to twig template
 2018-05-04 01:51:41 -03:00
Leonardo Strozzi
5bc8689b13 Addapt getTableHeader to twig template 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-05-03 22:21:02 -03:00
Piyush Vijay
4304a66995 Duplicate hidden token input field issue solved (#14211) 
* Duplicate hidden token input fields: #14209 issue fixed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* duplicate hidden input for token removed from error reporting form.
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-05-03 21:47:05 -03:00
Maurício Meneghini Fauth
475c186bf9
Merge pull request #14254 from williamdes/issue-14253-git-submodule 
#14253 Git commit info not showing when the repository is a submodule
 2018-05-03 21:33:36 -03:00
William Desportes
9687dfbfd2
#14253 Git commit info not showing when the repository is a submodule 
Added tests for Config::checkGitRevision and Config::isGitRevision

Closes: #14253
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-04 01:26:22 +02:00
Isaac Bennetch
c580f7e06b Slight language improvement 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-03 16:05:52 -04:00
Piyush Vijay
9c7c5ca951 Changes to make Get auto saved query and show this query here again button functional (#14166) 
* Handling of autosaved query and making get auto-saved query button functional
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Basic functionality of show this query here again added
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Show this query here again checkbox working properly
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* deleting auto_saved_sql on clicking submit query button
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* javascript error handled
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* javascript error of JSON undefined removed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 16:50:38 -03:00