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

113533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lakshay arora
568bc133cb Some other bug fixes 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-07-12 12:53:13 +05:30
Lakshay arora
3a52e20559 Solve Tokem mismatch error. 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-07-12 12:53:13 +05:30
Lakshay arora
aae6ff4424 First implementation. To be tested 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-07-12 12:53:13 +05:30
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
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
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
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
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
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
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
Aswani Prakash
b978def8dc #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>
 2018-07-03 21:05:42 -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
Maurício Meneghini Fauth
5e2e27dfeb
Merge pull request #14233 from nulll-pointer/recent_table_issue 
Fixes issue with recent table list, #14229
 2018-07-03 20:46:44 -03:00
Maurício Meneghini Fauth
1f291fc709 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:18:23 -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
Maurício Meneghini Fauth
4001f6592b
Merge pull request #14409 from nulll-pointer/null_default_error 
Fix NULL as default not shown, #14333
 2018-07-03 19:35:55 -03:00
Isaac Bennetch
7967591f4e Fix failing linter test 
See https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/398682628#L732

Line change was introduced with 9d08a1dcaf

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-07-02 09:49:56 -04:00
Maurício Meneghini Fauth
2334119d8a
Merge pull request #14442 from laps15/refactor_server 
Refactor server templates
 2018-06-30 17:21:28 -03:00
Leonardo Strozzi
7dc44b2ea9 Fix tests for server_engine 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 22:27:37 -03:00