gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,874 Commits 12 Branches 481 Tags 2.4 GiB
4f1432eb2f
Commit Graph

105874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
4f1432eb2f ChangeLog entry for #12300 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:57:26 +05:30
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
Michal Čihař
ee7d7d0b45 Fixed rendering BBCode links in setup 
The URL validation needs to be adjusted for setup as the links need to
go one level up.

Fixes #12512

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 09:47:29 +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
yanagimoto
168a419f48 Translated using Weblate (Japanese) 
Currently translated at 70.9% (2276 of 3206 strings)

[CI skip]
 2016-09-16 09:36:24 +02:00
Dadan Setia
e285135deb Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]
 2016-09-16 09:36:23 +02:00
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
Deven Bansod
d6b80ad910 ChangeLog entry for #12473 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-14 23:02:18 +05:30
Michal Čihař
b593bfeb7c Update SQL parser to 3.4.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 16:04:50 +02:00
Michal Čihař
16474f3dde Update SQL parser to 3.4.5 
- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 11:04:53 +02:00
Deven Bansod
bc589dfbbf Fix Class name 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:13:55 +05:30
Deven Bansod
7fdffa313f Fix label for Add User Group form 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:08:56 +05:30
jin123456bat
c73c720cb3 Translated using Weblate (Chinese (China)) 
Currently translated at 87.9% (2819 of 3206 strings)

[CI skip]
 2016-09-11 06:44:18 +02:00
Martin Lacina
35bf74a174 Translated using Weblate (Slovak) 
Currently translated at 83.5% (2680 of 3206 strings)

[CI skip]
 2016-09-09 15:45:58 +02:00
Michal Čihař
0bea337231 Changelog for #11924 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:29:35 +02:00
Michal Čihař
42d54a938a Remove MySQL version caching 
In my testing the session/cache access is slower than fetching single
value from MySQL and calculating the values.

Also the caching would need some logic for invalidation as the server
can be upgraded or configuration changed.

Fixes #11924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:28:13 +02:00
Michal Čihař
f3cd949738 Changelog for issue #12470 
Fix possible race condition in setting URL hash

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 12:45:25 +02:00
Michal Čihař
8ebc43ebc1 Merge pull request #12541 from sudheesh001/QA_4_6 
Fixes #12470 Stores tab_id hash into a variable instead of location.hash
 2016-09-06 12:44:44 +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ř
6c9c8a83d0 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-09-06 11:33:45 +02:00
Michal Čihař
9df5aebc22 Changelog entry for #12531 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 11:33:03 +02:00
Weblate
5e15a2b054 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-06 11:32:00 +02:00
Sevdimali İsa
954ebe9cbc Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1680 of 3206 strings)

[CI skip]
 2016-09-06 11:31:57 +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
6bcc593c84 Fix 'Unsupported query' message from Travis logs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-05 23:00:12 +05:30
Balázs Úr
934c740c2c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-05 18:00:46 +02:00
Balázs Úr
0a7d3afd27 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-04 20:17:23 +02:00
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ř
e803caed71 Use single quotes in PHP code 
Fixes #12405

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:23:21 +02:00
Weblate
2e58cf0105 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-02 14:41:00 +02:00
Jozef Pistej
beda3204d5 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2675 of 3206 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
48b44fcf91 Translated using Weblate (Russian) 
Currently translated at 98.1% (3153 of 3213 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
e01f404804 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:40:18 +02:00
Michal Čihař
829d51c9dd Treat hide_location error as user ones 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:38:52 +02:00
Michal Čihař
eb3e3b73c3 Simplified handling of connection errors 
There is no need to retrigger errors, just let the handler know to
handle them without backtrace.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:35:36 +02:00
Michal Čihař
2251ca21c0 Fix regexp for file path cleanup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:25:04 +02:00
Michal Čihař
cb3f2632a9 Properly escape session startup errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:23:35 +02:00
Michal Čihař
f3ca367efa Fix number formatting with different settings of precision in PHP 
- fixed Util::formatNumber to avoid rounding issues to mess up display
- force precision = 14 to ensure we get sane behavior

With precision set to higher value many things do not behave as expected
producing strange numbers in various places.

For example with precision=19 you get:

php > echo round(1.2, 2);
1.199999999999999956

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 15:51:18 +02:00
Michal Čihař
f3babbb945 Correctly calculate string length 
Fixes #12517

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:48:43 +02:00
Michal Čihař
a3d811571a Fix <iframe> tag 
Fixes #12513

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:14:02 +02:00
Michal Čihař
c9000876d5 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-30 14:12:26 +02:00
Michal Čihař
d24dd24b75 Ensure unlim_num_rows is numberic 
Fixes #12516

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:08:47 +02:00
Weblate
7563c88c9b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-30 14:05:32 +02:00
Diego Bemquerer Castro
e16af0866d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3206 strings)

[CI skip]
 2016-08-30 14:05:31 +02:00
Michal Čihař
ee1878d3ca Extend .gitignore 
Fixes #12515

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:04:55 +02:00
Michal Čihař
38ce0c9d44 Remove unused paramenter when connecting to MySQLi 
Fixes #12502

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:30:32 +02:00
Isaac Bennetch
efe97b1500 Unable to edit transformations, issue 12292 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-27 11:51:37 -04: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
Deven Bansod
d7181d1b5a ChangeLog entries for #12476 and #12477 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:04:19 +05:30