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

113006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
93ec29933b Fix - #14382 "Visualize GIS data" icon missing 
Closes: #14382
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit b3379d7700)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:42:32 -03:00
William Desportes
863badfdc2 Patch - missed instance of 'Avoid passing extension to Util::getImage' 
Patch for commit bed6fb4ebd

Fixes: #14390
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit ff4785cbf2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:40:32 -03:00
William Desportes
71ae2b2e68 Fix for #14171 - 2FA QR PHPGD 
Closes: #14171
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 49fae81505)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:54:54 -03:00
Maurício Meneghini Fauth
22a432eaac Add ChangeLog entry for #14377 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:09:01 -03:00
Miki
914745dbaa Populate options for view create and edit (#14377) 
Signed-off-by: Miki <amoo_miki@yahoo.com>
(cherry picked from commit da8b6a90df)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:07:37 -03:00
Maurício Meneghini Fauth
fca206f27a Fix some JavaScript coding style issues 
Automatic fixes by ESLint

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 22:46:48 -03:00
Maurício Meneghini Fauth
8a7b631bf8 Add ChangeLog entry for #14327 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 22:16:44 -03:00
Piyush Vijay
27caff1ce0 Fix editing server variable not showing save or cancel option (#14328) 
* Editing server variable not showing save or cancel option issue #14327: fixed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Styling of the links improved.
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
(cherry picked from commit bd7d4ca22f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 22:15:55 -03:00
Maurício Meneghini Fauth
9bbc4c3441 Add ChangeLog entry for #14045 
Fix trailing whitespace in js/functions.js

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 21:18:39 -03:00
Aswani Prakash
636dd335c6 #14045 issue fix filtering is slow (#14236) 
* 14045 issue fix filtering is slow

Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>

* space issue

Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit b978def8dc)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 21:08:01 -03:00
Maurício Meneghini Fauth
a827bec4aa Add ChangeLog entry for #14229 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:52:49 -03:00
Lakshay arora
a747de1add Fixes issue with recent table list, #14229 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

(cherry picked from commit 727b40e00c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:50:04 -03:00
Weblate
e6e9b57f1c Merge branch 'origin/QA_4_8' into Weblate 2018-07-04 01:16:28 +02:00
Aswani Prakash
93d3bae766 Translated using Weblate (Malayalam) 
Currently translated at 1.7% (57 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ml/
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-07-04 01:16:26 +02:00
Marino
22cdd16649 Translated using Weblate (Croatian) 
Currently translated at 26.8% (883 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/hr/
Signed-off-by: Marino <mrabach@gmail.com>
 2018-07-04 01:16:22 +02:00
Maurício Meneghini Fauth
4ac8139540 Add ChangeLog entry for #14333 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:15:09 -03:00
Lakshay arora
303cc9c1a0 Fix NULL as default not shown, #14333 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 39f19fd20f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:13:08 -03:00
Isaac Bennetch
fc5586fb6a ChangeLog entry for pull request #14398, fixing bug #14314 
This change was cherry-picked to commit
b0ec6b69e9

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-29 10:55:47 -04:00
Lakshay arora
b0ec6b69e9 Fix for #14314, error while naming a database '0' 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-29 10:40:54 -04:00
Pedro Silva
1f079fa7b0 Translated using Weblate (Portuguese) 
Currently translated at 57.0% (1876 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt/
Signed-off-by: Pedro Silva <sparta14gaming@gmail.com>
 2018-06-26 23:41:09 +02:00
Isaac Bennetch
42f36cce39 Prepare for version 4.8.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:41:45 -04:00
Isaac Bennetch
064f6cc0ec Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:17:18 -04:00
Isaac Bennetch
3115f340b9 Adding composer lock for 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:07:34 -04:00
Isaac Bennetch
d363fa02c6 Prepare for version 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:50:09 -04:00
Isaac Bennetch
2867a95523 Update Changelog for RCE/file inclusion security issue 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:44:16 -04:00
Isaac Bennetch
26c6e87682 Merge remote-tracking branch 'security/QA_4_8-security' into QA_4_8 2018-06-21 11:31:18 -04:00
Isaac Bennetch
536b214757
Merge pull request #14418 from nijel/page_validity 
Avoid looking for ? when checking for file to be included
 2018-06-21 11:26:15 -04:00
Michal Čihař
7662d02939 Avoid looking for ? when checking for file to be included 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:31:00 +02:00
Michal Čihař
c27b9c12f2 Fix broken links in docs 
Use replacements when applicable, remove one dead link.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:29:36 +02:00
Isaac Bennetch
ead0d0d985 ChangeLog entry for PMASA-2016-03, XSS in Designer. 
This is commit 6943fff873, cherry-picked
from master.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-19 11:55:41 -04:00
William Desportes
6943fff873 Escape database name in URL 
Designer > new page shows iframe when db name is: "'"><iframe onload=alert(1)>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-19 11:32:17 -04:00
Weblate
ddf9b786e4 Merge branch 'origin/QA_4_8' into Weblate 2018-06-15 20:33:48 +02:00
Kuba Niewiarowski
2baee169f5 Translated using Weblate (Polish) 
Currently translated at 94.4% (3105 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/
Signed-off-by: Kuba Niewiarowski <jakub@niewiarowski.it>
 2018-06-15 20:33:45 +02:00
Sebastian Weremczuk
6acb3a928b Translated using Weblate (Polish) 
Currently translated at 94.4% (3105 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/
Signed-off-by: Sebastian Weremczuk <weremczuksebastian@gmail.com>
 2018-06-15 20:33:44 +02:00
Plajer
a6b5207a97 Translated using Weblate (Polish) 
Currently translated at 94.4% (3105 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/
Signed-off-by: Plajer <worthplay.pt@onet.pl>
 2018-06-15 20:33:43 +02:00
Maurício Meneghini Fauth
167f6a7223 Add ChangeLog entry for #14225 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-15 15:31:09 -03:00
William Desportes
85bff866d4 Closes #14225 - missing index icon 
Closes: #14225
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 5815c1570e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-15 15:28:42 -03:00
Yaron Shahrabani
ce556fe98b Translated using Weblate (Hebrew) 
Currently translated at 48.7% (1604 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-06-15 15:38:50 +02:00
Maurício Meneghini Fauth
d96b740284 Add ChangeLog entry for #14370 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-13 21:37:25 -03:00
William Desportes
632309bad8 Fixes #14370 
Fixes error when mysqli::fetch_array returns NULL for 'SELECT * FROM mytable WHERE 0;'

Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit a9dce0b40e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-13 21:36:10 -03:00
Yaron Shahrabani
e1d9497f8e Translated using Weblate (Hebrew) 
Currently translated at 48.5% (1595 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-06-12 22:38:49 +02:00
Santeri Hietanen
a5bd015ec9 Translated using Weblate (Finnish) 
Currently translated at 66.6% (2191 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fi/
Signed-off-by: Santeri Hietanen <santerivr@hotmail.com>
 2018-06-11 23:37:16 +02:00
Yaron Shahrabani
024774ffb6 Translated using Weblate (Hebrew) 
Currently translated at 47.7% (1571 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-06-10 15:38:54 +02:00
ۋولقان
41e8edae3e Translated using Weblate (Uyghur) 
Currently translated at 9.8% (324 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ug/
Signed-off-by: ۋولقان <nureliosman@gmail.com>
 2018-06-08 06:44:00 +02:00
Yaron Shahrabani
5034ad494f Translated using Weblate (Hebrew) 
Currently translated at 47.6% (1568 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-06-01 16:38:18 +02:00
Robert Antoni Buj Gelonch
eec7b4943c Translated using Weblate (Catalan) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ca/
Signed-off-by: Robert Antoni Buj Gelonch <robert.buj@gmail.com>
 2018-05-31 10:35:15 +02:00
Yaron Shahrabani
330bd2617c Translated using Weblate (Hebrew) 
Currently translated at 47.6% (1567 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-05-29 08:38:15 +02:00
Weblate
069f6fdeac Merge branch 'QA_4_8' into weblate-merge-tmp 2018-05-25 05:31:45 +02:00
Domen
7402ce6b96 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2018-05-25 05:31:43 +02:00
Isaac Bennetch
5d85c6d768 Prepare for 4.8.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-24 23:31:18 -04:00