gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,583 Commits 12 Branches 481 Tags 2.4 GiB
696eeb463d
Commit Graph

71 Commits

Author SHA1 Message Date
Michal Čihař
29c0ddaaf1 Merge branch 'QA_4_6' 2016-07-29 10:48:19 +02:00
Michal Čihař
74016bceea Merge pull request #12416 from rpv-tomsk/fix-replication-status 
Fix replication status output in Server > Databases
 2016-07-29 10:46:11 +02:00
Pavel Rochnyack
b705dc5f67 Fix replication status output in Server > Databases 
Broken by 829a84b46e refactoring.
Incorrectly fixed in c4710c3e1d

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-29 04:43:08 +01:00
Michal Čihař
bb18c5e02f Merge branch 'QA_4_6' 2016-07-28 11:06:43 +02:00
Pavel Rochnyack
c310304712 Restore Overhead column in Server > Databases > Enable Statistics. 
(Was removed in 582b02262b)

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-27 19:56:43 +01:00
Michal Čihař
e14c334d7a Merge branch 'QA_4_6' 2016-07-26 16:47:33 +02:00
Michal Čihař
16c4ca0daa Properly escape configuration parameters when rendering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:47:01 +02:00
Michal Čihař
1132e53f28 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:19:21 +02:00
Michal Čihař
a7a44c28c5 All charsets/collation we get from the MySQL server are available 
There is no need for explicit checking for availability later in the
code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:17:32 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:55:42 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:07:27 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:42:29 +02:00
Michal Čihař
cfc2f1cb05 Move charsets obtaining to the Charsets class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:49:09 +02:00
Deven Bansod
c47a275e22 Added newly introduced variables 
Changed appropriate variables to have byte-formatting

Fixed tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-23 16:19:53 +05:30
Durgesh
d798809215 Filtering databases on databases listing, Issue #12047 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-03 16:21:15 +05:30
Durgesh
307f7069e5 Templating getWithSelected() and getCheckbox(), Issue #12004 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-23 18:10:24 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Piyush
1d3f8ed037 remove_msie9 (fix_11987) 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2016-02-20 12:26:54 +05:30
Madhura Jayaratne
f4989760c0 More templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 20:31:56 +11:00
Madhura Jayaratne
4085ccd275 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 19:55:02 +11:00
Madhura Jayaratne
fbed4c09bc Fix undefined error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:50:42 +11:00
Madhura Jayaratne
4d7597bd9b Make binary_logs an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:21:26 +11:00
Madhura Jayaratne
04fd884d2a Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:13:39 +11:00
Madhura Jayaratne
51f3902f28 Use own response object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:12:34 +11:00
Madhura Jayaratne
23d8a60da8 Introduce a controller for binary logs page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 17:40:35 +11:00
Michal Čihař
20c74d2124 Consistent parameter type docs (number -> integer) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:13:53 +01:00
Michal Čihař
a74efb0c30 Simplify getting first element of an array 
Calling current() after reset() is duplicate as reset() already returns
current index value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:37:50 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Madhura Jayaratne
a624f09e24 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:49:23 +11:00
Madhura Jayaratne
e199708ff2 Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:38:31 +11:00
Madhura Jayaratne
ca44bbd93b Template plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:36:51 +11:00
Madhura Jayaratne
ff647fd63b Set the variable directly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:12:27 +11:00
Madhura Jayaratne
07c9d21162 Plugin list of centralized to this controller. Make it an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:10:32 +11:00
Madhura Jayaratne
25c7812120 It does not really require a separate method to get the SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:04:19 +11:00
Madhura Jayaratne
3d1a52c1b0 Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:02:16 +11:00
Madhura Jayaratne
e23827f67f Create a controller class for server plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:01:12 +11:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Hugues Peccatte
f04a678bad Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:16:13 +01:00
Madhura Jayaratne
05a2e0305e Pass the engine to the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:18 +11:00
Madhura Jayaratne
45f11c4bb5 Template engine details page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 10:32:42 +11:00
Madhura Jayaratne
9a40624d17 Template engines list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 09:02:38 +11:00
Madhura Jayaratne
aa2f9c444a Add a controller for server engines page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 08:50:18 +11:00
Madhura Jayaratne
090a7e4323 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 20:14:28 +11:00
Madhura Jayaratne
2692af32d9 Use a controller for server_collations page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 19:54:29 +11:00
Madhura Jayaratne
ced43af95d More style violations in controllers fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:48:37 +11:00
Madhura Jayaratne
9416ff7c3f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-26 19:28:41 +11:00
Madhura Jayaratne
cd6e5b0025 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:26:26 +11:00
Marc Delisle
9334a2d356 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-24 10:18:58 -05:00
Madhura Jayaratne
ba8859d7df Merge branch 'master' into refactor 
Conflicts:
	db_create.php
 2015-11-24 21:07:09 +11:00