webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

4714 Commits

Author SHA1 Message Date
Michal Čihař
fc5bb4a278 Merge branch 'QA_4_6' 2016-10-03 19:38:40 +02:00
Deven Bansod
fdc80a2fd9 Fix #12455: Query history stores separate entry for every letter typed 
Don't store history when linting, rather store it only when user has submitted the query.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-30 10:47:02 +05:30
Deven Bansod
05cd315074 Merge branch 'QA_4_6' 2016-09-20 23:05:41 +05:30
Deven Bansod
5a456eb1ea Fix extra spaces in field name in adding key and dropping field 
Fix #12575

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 22:55:23 +05:30
Michal Čihař
7fc28626fd Merge branch 'QA_4_6' 2016-09-19 10:51:50 +02:00
Michal Čihař
5c0af8facf Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 2016-09-19 10:51:45 +02:00
Michal Čihař
bccd690673 Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 2016-09-19 10:50:39 +02:00
Michal Čihař
61d8dc4791 Merge branch 'QA_4_6' 2016-09-19 10:47:31 +02:00
Michal Čihař
e2ac325a7a Merge remote-tracking branch 'origin/pull/12557' into QA_4_6 2016-09-19 10:46:56 +02:00
Deven Bansod
4605f0b1c9 Merge branch 'QA_4_6' 2016-09-16 18:39:41 +05:30
Deven Bansod
71cce8e2f5 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-09-16 18:38:31 +05:30
Deven Bansod
a588880750 Special handling for radio fields after cloning on tbl insert page 
Fix #12272

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 18:33:28 +05:30
Michal Čihař
24c9df9a20 Merge branch 'QA_4_6' 2016-09-16 11:20:46 +02:00
Michal Čihař
b18426f887 Correctly reference Math.min (issue #12550) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:20:42 +02:00
Deven Bansod
b054aa70ef Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export 
User can always check it if he/she wants to export the procs,funcs etc. too

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:57:07 +05:30
Deven Bansod
a52597f048 Include explaning statements near related code 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:56:15 +05:30
Deven Bansod
023ced3552 Don't use PMA_DROP_IMPORT on Table insert if it has Blob field 
If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files feature
on Table Insert page with blob field

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:55:46 +05:30
Deven Bansod
f8ea67f2bc Fix #12530: Show enabled links for Edit and Execute after proper priv checks 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:34 +05:30
Michal Čihař
ccee3adaee Merge branch 'QA_4_6' 2016-09-16 09:37:33 +02:00
Michal Čihař
54e3434c0f Do not try to keep alive session even after expiry 
There is no sense in sending keepalive requests even after potential
session expiry. So limit sending of these only as long we're not idle
over cookie login validity.

Fixes #12550

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 09:36:50 +02:00
Deven Bansod
9517695eb4 Merge branch 'QA_4_6' 2016-09-14 23:07:57 +05:30
Deven Bansod
10e4f0a3dd Check if the regex matching returns null before using it further 
Fix #12473 : Code can throw unhandled exception

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-14 23:06:25 +05:30
Michal Čihař
138c204cb9 Merge branch 'QA_4_6' 2016-09-06 12:45:41 +02:00
Sudheesh Singanamalla
40d9d82840 Fixes #12470 Stores tab_id hash into a variable instead of location.hash 
Signed-off-by: Sudheesh Singanamalla <sudheesh1995@outlook.com>
 2016-09-06 15:28:46 +05:30
Michal Čihař
3debfa5d1f Merge branch 'QA_4_6' 2016-09-06 11:33:32 +02:00
Michal Čihař
28c981dd31 Merge pull request #12532 from devenbansod/fix_12531 
Fix #12531 : Properly flag queries as DROP DATABASE
 2016-09-06 11:31:53 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Deven Bansod
288b8fdcaa Merge branch 'QA_4_6' 2016-09-04 20:36:28 +05:30
Deven Bansod
2a2d6d8bd6 Fix #12534: Remove option from after_field select after a column is dropped 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-04 20:34:36 +05:30
Michal Čihař
4852e9b070 Perform logout using POST method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:00:48 +02:00
Deven Bansod
bf25be1ac3 Fix more Token mismatches in tbl_operations.js 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 15:06:47 +05:30
Deven Bansod
a41776d6a1 Some more Token mismatch errors in tbl_ scripts, Issue #12523 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 14:13:26 +05:30
Deven Bansod
857be4efdf Some more Token mismatch errors, Issue #12523 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 14:03:51 +05:30
Deven Bansod
4977f142f1 Fix token mismatch errors in replication and routines 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 13:43:08 +05:30
Deven Bansod
33f97474b2 Add token parameter POST requests in indexes.js, navigation.js 
Issue #12523

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 12:31:34 +05:30
Deven Bansod
eb27081a50 Use appropriate name 'params' instead of 'data' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 18:16:29 +05:30
Deven Bansod
18dbcba02d Fix 'Token mismatch' in deleting tracking from db_tracking 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 14:36:18 +05:30
Deven Bansod
917d9581b7 Fix 'Token mismatch' in drop and truncating a table from db_structure 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:30:49 +05:30
Deven Bansod
8d65036a09 Fix 'Token mismatch' in db_search 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:21:35 +05:30
Deven Bansod
a40a948d26 Fix 'Token mismatch' in Drop Database 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:59:05 +05:30
Deven Bansod
51c04bcaec Remove unneeded debugging statements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:45:34 +05:30
Michal Čihař
b4807f74e8 Merge branch 'QA_4_6' 2016-08-27 09:16:08 +02:00
Michal Čihař
ad5187383d Automatically save SQL query in browser local storage 
..when available rather than in cookie as we do not want to send huge
cookies with SQL query there and back.

Issue #12251
Issue phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 09:15:28 +02:00
Michal Čihař
c95a2c35eb Merge branch 'QA_4_6' 2016-08-25 09:40:59 +02:00
Michal Čihař
fb3b722da1 Fixed random logouts due to wrong cookie path 
Some script did not properly configure their relative path and this
could lead to wrong cookie path being set. This doesn't happen in all
cases as the PHP session engine doesn't seem to set the cookie session
in every request.

Fixes #12251
Fixes phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 09:38:17 +02:00
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00
Michal Čihař
6faa1fe46a Add rel="noopener noreferrer" to all external target="_blank" links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-18 17:35:20 +02:00
Michal Čihař
23b34b1880 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-08-17 15:40:04 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
311be7515c Use https when available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 13:17:41 +02:00