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

113549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
321cef9c6e
Merge pull request #14489 from williamdes/issue-14488-type-error 
Fix #14488 - Type error when recalling/submitting/viewing/deleting a bookmarked query
 2018-07-18 07:06:54 -04:00
William Desportes
a23a3a7776
Fix #14488 - Type error 
Closes: #14488
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-07-18 12:01:35 +02:00
Madhura Jayaratne
90006d93ca Merge branch 'QA_4_8' 2018-07-17 09:03:19 +10:00
Madhura Jayaratne
be6b8d48eb ChangeLog entry for #14365. Load SQL query from the query parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-07-17 09:02:22 +10:00
Lakshay arora
d9797819ad Fix #14365, View not working on multiple servers 
Fixes #14365
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-07-17 08:57:11 +10:00
Madhura Jayaratne
f80b4486b5
Merge pull request #14441 from nulll-pointer/view_create_multiple_server 
Fix #14365, View not working on multiple servers
 2018-07-17 08:55:44 +10:00
Madhura Jayaratne
0b9e198094 Fix #14435 Event scheduler status toggle doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-07-16 16:02:42 +10:00
Maurício Meneghini Fauth
821ce53a25 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-14 14:57:20 -03:00
Maurício Meneghini Fauth
b611be78b3 Fix unconverted variables to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-14 14:54:29 -03:00
Maurício Meneghini Fauth
1079140280
Merge pull request #14483 from laps15/inheritance 
Refactor table secondary tabs tamplate
 2018-07-13 20:09:33 -03:00
Leonardo Strozzi
6b08a7c326 Refactor table secondary tabs tamplate 
Implements inheritance on relation and structure templates

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-13 09:43:41 -03:00
Maurício Meneghini Fauth
c2c5bfc670
Merge pull request #14480 from laps15/refactor_tables 
Refactor table search templates
 2018-07-12 18:34:47 -03:00
Maurício Meneghini Fauth
13874a6937 Fix uncaught TypeError 
strlen() expects parameter 1 to be string

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-11 18:08:40 -03:00
Leonardo Strozzi
108f445ee6 Merge table structure tamplates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-11 17:14:05 -03:00
Leonardo Strozzi
4e81d3f27d Refactor table search templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-11 16:10:01 -03:00
Maurício Meneghini Fauth
db5ecb357f
Merge pull request #14458 from williamdes/issue-14457-null 
Fix #14457 - mb_stubstr null
 2018-07-11 15:54:38 -03:00
Yaron Shahrabani
3f1e40caa7 Translated using Weblate (Hebrew) 
Currently translated at 49,3% (1621 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-07-11 15:39:17 +02:00
Weblate
d2a282b522 Merge branch 'origin/master' into Weblate 2018-07-11 01:23:41 +02:00
Yaron Shahrabani
35d9bdd187 Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1625 of 3291 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-07-11 01:23:37 +02:00
Maurício Meneghini Fauth
ce66ab27ea
Merge pull request #14471 from laps15/refactor_tables 
Refactor tables' tamplates
 2018-07-10 20:23:25 -03:00
Olivier Humbert
2e5255cf51 Translated using Weblate (French) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2018-07-09 01:37:39 +02:00
Olivier Humbert
e9ac9a29d0 Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2018-07-09 01:37:32 +02:00
Leonardo Strozzi
3b8746547d Fix php code sniffer errors 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-08 18:31:04 -03:00
Leonardo Strozzi
e95505239d Adapt table tracking main tests 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-08 17:55:38 -03:00
Leonardo Strozzi
bcad25a84a Refactor table_tracking main tamplates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-07-08 17:40:59 -03:00
Freedoctor
c55b2e1def Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.8% (2759 of 3291 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: Freedoctor <Freedoctor@qq.com>
 2018-07-08 02:36:04 +02:00
Olivier Humbert
2a7294a932 Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2018-07-07 14:37:12 +02:00
William Desportes
bdd60af282
Fix #14457 - mb_stubstr null 
Closes: #14457
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-07-07 00:58:11 +02:00
Stanislas Brodin
13dfc93da6 Translated using Weblate (French) 
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/fr/
Signed-off-by: Stanislas Brodin <stanislas.brodin@gmail.com>
 2018-07-06 14:04:07 +02:00
Maurício Meneghini Fauth
cf8e559987 Fix error when writing the selected rows to a file 
Fix #14434

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-05 21:43:21 -03:00
Maurício Meneghini Fauth
676986aa4e Merge branch 'QA_4_8' 2018-07-04 20:45:32 -03:00
Maurício Meneghini Fauth
865f16a7f6 Add ChangeLog entries for #14390 and #14382 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:44:01 -03:00
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
Maurício Meneghini Fauth
b2e4f01dcc
Merge pull request #14414 from williamdes/issue-14390-db-show 
Patch - missed instance of 'Avoid passing extension to Util::getImage' and GIS icon
 2018-07-04 20:26:54 -03:00
Maurício Meneghini Fauth
da21c50f87 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:56:41 -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
5f5515c1dd
Merge pull request #14356 from williamdes/issue-14171-phpgd 
Fix for #14171 - 2FA+QR+PHPGD
 2018-07-04 19:48:17 -03:00
Maurício Meneghini Fauth
b44e1c4fc6 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:12:26 -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
Miki
da8b6a90df Populate options for view create and edit (#14377) 
Signed-off-by: Miki <amoo_miki@yahoo.com>
 2018-07-04 19:00:28 -03:00
Maurício Meneghini Fauth
c697a872a1 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 22:49:38 -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
6da0700116 Merge branch 'QA_4_8' 2018-07-03 22:17:56 -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
Piyush Vijay
bd7d4ca22f 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>
 2018-07-03 22:13:44 -03:00
Maurício Meneghini Fauth
8343e67759 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 21:22:11 -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