gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,062 Commits 12 Branches 481 Tags 2.4 GiB
18cfc24743
Commit Graph

9642 Commits

Author SHA1 Message Date
Marc Delisle
0a9bdc1619 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:41:55 -05:00
Marc Delisle
bf074566b5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:39:29 -05:00
Madhura Jayaratne
754299769a Fix ChangeLog entry 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-13 09:56:13 +11:00
Madhura Jayaratne
1c7282b859 Merge branch 'QA_4_5' 
Conflicts:
	test/classes/plugin/export/ExportSqlTest.php
 2015-12-11 19:26:26 +11:00
Madhura Jayaratne
ceeec424d7 #11728 CSV import skip row count after 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:00:38 +11:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
d9279025f9 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-11 16:27:35 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Marc Delisle
8956fa805a Merge branch 'QA_4_5' 2015-12-10 12:19:20 -05:00
Marc Delisle
d008352582 IE 8 compatibility in console 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-10 12:18:38 -05:00
Madhura Jayaratne
000d679d63 Merge branch 'QA_4_5' 2015-12-10 07:07:28 +11:00
Madhura Jayaratne
269fcd2a54 issue #11724 Temporary fix for live data edit of big sets is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-10 07:01:42 +11:00
Michal Čihař
3da8853467 Merge branch 'QA_4_5' 2015-12-07 16:39:31 +01:00
Michal Čihař
b96aa8ff94 Avoid duplicite fetching of table information 
We already have that, so there is no need to issue the query
again.

Fixes #11714

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:39:11 +01:00
Michal Čihař
b94318c4cd Merge branch 'QA_4_5' 2015-12-07 15:37:08 +01:00
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode 
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 15:33:37 +01:00
Marc Delisle
d9bec7f085 HTML line break shown after a MySQL connection error message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:02:07 -05:00
Madhura Jayaratne
74c651e4d8 Merge branch 'QA_4_5' 2015-12-07 17:03:07 +11:00
Madhura Jayaratne
0375802fc0 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-07 16:59:22 +11:00
Madhura Jayaratne
dade3fa2e4 Fix #11706 Database export template not saving compression option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-07 16:56:18 +11:00
Michal Čihař
0d15a96427 Merge branch 'QA_4_5' 2015-12-04 12:14:41 +01:00
Michal Čihař
17930c26df Properly report error on connecting 
The $link can be false at this point and DBI backends handle this
correctly to get global error. This usually happens on connecting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 12:13:47 +01:00
Marc Delisle
2f2b505a2e Fixes ##11711 Clarify the meaning of "Stand-in structure for view" in SQL export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:44:14 -05:00
Michal Čihař
c7c2ff4ab6 issue #11708 Remove no password warning 
The empty password has to be enabled by AllowNoPassword, so user should
know what he is doing. Showing this warning every time doesn't bring any
additional security.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 08:51:11 +01:00
Madhura Jayaratne
547c977bc1 issue #11701 Allow changing parameter order of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 12:20:16 +11:00
Marc Delisle
288c03cd43 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 08:34:24 -05:00
Marc Delisle
ad719a39b3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 15:07:29 -05:00
Deven Bansod
7e60b051c6 ChangeLog entry for issue #11504 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-30 00:14:17 +05:30
Marc Delisle
ce34b0ffa8 Merge branch 'QA_4_5' 2015-11-27 08:33:16 -05:00
Marc Delisle
7f9339105c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-27 08:32:33 -05:00
Marc Delisle
62d05510b9 Merge branch 'QA_4_5' 2015-11-26 11:55:25 -05:00
Marc Delisle
25bd0b56e2 Fixes #11695 PMA_getDataForDeleteUsers() warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-26 11:55:01 -05:00
Deven Bansod
6640fe2877 Merge branch 'QA_4_5' 2015-11-26 19:43:32 +05:30
Deven Bansod
83672ac65c Changelog entry for #11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:43:21 +05:30
Deven Bansod
77f220cee5 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/plugins/auth/AuthenticationCookie.php
 2015-11-26 19:29:18 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:25:18 +05:30
Deven Bansod
31001963d2 Changelog entry for #11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:20:04 +05:30
Marc Delisle
0d8a4425d4 Merge branch 'QA_4_5' 2015-11-25 09:43:46 -05:00
Marc Delisle
2217a47934 With this fix, the generated SQL still gives on-screen warnings on semicolons 
but this will require a fix in the parser.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-25 09:41:58 -05:00
Marc Delisle
d01d1a7606 Merge branch 'QA_4_5' 2015-11-23 07:23:36 -05:00
Marc Delisle
43fc833a5d 4.5.2 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-23 07:22:38 -05:00
Marc Delisle
c3a30a0ad4 Merge branch 'QA_4_5' 2015-11-22 17:44:16 -05:00
Marc Delisle
9b34d380b1 Fixes #11685 Warning: Invalid argument supplied for foreach() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-22 17:43:25 -05:00
Marc Delisle
7bc15d37a3 Merge branch 'QA_4_5' 2015-11-19 11:42:22 -05:00
Marc Delisle
d89ba29b21 Incorrect script name in include 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-19 11:41:28 -05:00
Marc Delisle
ae2106f6bf Merge branch 'QA_4_5' 2015-11-19 11:27:23 -05:00
Marc Delisle
d37b26a1e9 Undefined index: SendErrorReports 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-19 11:27:01 -05:00
Marc Delisle
122270f064 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-18 06:46:48 -05:00
Dan Ungureanu
187e446246 Merge branch 'QA_4_5' 2015-11-17 22:30:12 +02:00
Dan Ungureanu
2502bfde14 Added ChangeLog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-11-17 22:27:23 +02:00