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

5235 Commits

Author SHA1 Message Date
Madhura Jayaratne
1f314848e5 Merge branch 'QA_4_8' 2018-07-22 22:43:42 +10:00
Madhura Jayaratne
e7fb82cfd5 Fix #14207 Partition actions in table structure do not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-07-22 22:42:28 +10:00
Madhura Jayaratne
90006d93ca Merge branch 'QA_4_8' 2018-07-17 09:03:19 +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
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
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
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
Lakshay arora
26c6ce2d77 Fix #14365, View not working on multiple servers 
Fixes #14365
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-29 22:42:47 +05:30
Lakshay arora
9d08a1dcaf Puts PMA import handler in a separate javascript file. 
Makes 'enable_drag_drop_import' as a separate configuration directive, removes it from group of $cfg['IMPORT'] directives.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-25 12:37:43 +05:30
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
Maurício Meneghini Fauth
2d58411bee Some coding style fixes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 21:30:06 -03:00
William Desportes
ce06b9422b
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-15 21:37:41 +02:00
William Desportes
096d170e04
Move designer config to javascript w/json 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:32 +02:00
William Desportes
fa303ee292
Prevent reposting of javascript errors 
Closes: #14359
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-05 01:55:30 +02:00
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax 
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
cce9efc61f Fix ESLint errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 02:16:31 -03:00
Xinyu Liu
e1519d2414 fix: toggle export options when selecting all struture or all data in database-level exports 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
(cherry picked from commit 298ef43482)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:55:32 -03:00
Maurício Meneghini Fauth
3c12c9efb4
Merge pull request #14119 from meteorlxy/patch-tmp 
fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066
 2018-05-16 14:52:46 -03:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 04:36:04 -03:00
Leonardo Strozzi
ffe49cb133 Fix central columns in-line edit bug 
fixes #14278

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
(cherry picked from commit dce39bb1f0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 03:56:31 -03:00
Maurício Meneghini Fauth
76b423d525
Merge pull request #14286 from laps15/bugfix 
Fix central columns in-line edit bug
 2018-05-15 03:54:44 -03:00
Madhura Jayaratne
80f93d6f02 Resolved merge conflict 2018-05-15 05:38:55 +10:00
Madhura Jayaratne
38c800c972 Fix #14289 Fix multi-column sorting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-15 05:25:45 +10:00
Leonardo Strozzi
dce39bb1f0 Fix central columns in-line edit bug 
fixes #14278

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-05-13 22:38:54 -03:00
Maurício Meneghini Fauth
9eea50ef3d ESLint automatic fixes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 05:02:30 -03:00
Piyush Vijay
bf0198938c Remember table's sorting broken in 4.8.0 issue: #14189 fixed 
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

(cherry picked from commit e58dd74c40)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 04:53:08 -03:00
Maurício Meneghini Fauth
1f76f859fb
Merge pull request #14204 from Piyush3079/PMA_14189 
Remember table's sorting broken in 4.8.0 issue: #14189 fixed
 2018-05-12 04:51:29 -03:00
Maurício Meneghini Fauth
2936492555 Revert "Replace .focus() with .on()" 
This reverts commit d18076eb96.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 02:40:33 -03:00
Maurício Meneghini Fauth
d18076eb96 Replace .focus() with .on() 
.focus() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 02:17:51 -03:00
Maurício Meneghini Fauth
3bf83954a0 Replace .keyup() with .on() 
.keyup() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 01:28:32 -03:00
Maurício Meneghini Fauth
0ff776a6cf Replace .mousedown() with .on() 
.mousedown() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 01:15:28 -03:00
Maurício Meneghini Fauth
c0c233f8ef Replace .keydown() with .on() 
.keydown() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 00:36:24 -03:00
Maurício Meneghini Fauth
8f8e3c26c9 Replace .click() with .on() 
.click() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-11 23:58:35 -03:00
Maurício Meneghini Fauth
f4fedc20ee Replace .change() with .on() 
.change() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-11 20:45:36 -03:00
Maurício Meneghini Fauth
07591c963c Replace .mouseenter() with .on() 
.mouseenter() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-11 20:45:36 -03: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
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
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
Maurício Meneghini Fauth
393204ccd0 Upgrade CodeMirror to v5.37.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-02 20:12:40 -03:00