Commit Graph

161 Commits

Author SHA1 Message Date
Marc Delisle
f90e9b44f9 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-30 07:53:22 -04:00
Marc Delisle
40c910d75f Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-30 07:12:22 -04:00
Madhura Jayaratne
d7611d65e8 Separate method to add tracking icon
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-30 19:32:44 +11:00
Madhura Jayaratne
d2f3c499f9 Move code related to approximate row counting to a separate method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-30 19:16:33 +11:00
Madhura Jayaratne
8833d80697 Remove dead code. Already handled in addRemoveFavoriteTablesAction()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-30 18:52:15 +11:00
Madhura Jayaratne
2044f9fca6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-30 18:40:37 +11:00
Madhura Jayaratne
c4bd990ff6 Refactor and move our replication related section
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-30 18:39:27 +11:00
Benjamin Hodgetts
a1c5557430 Fixes #11619 TokuDB Tables Show Size as "unknown"
Signed-off-by: Benjamin Hodgetts <ben@xnode.org>
2015-10-29 09:42:10 -04:00
Madhura Jayaratne
7ae7ea459a Broadly refactor indexAction(). Furthre finer refactoring needs to be carried out
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 23:37:13 +11:00
Madhura Jayaratne
8e3c97920a Improve organization
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 23:26:39 +11:00
Madhura Jayaratne
cb6186bb9c Create new multi submit action
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 22:27:43 +11:00
Madhura Jayaratne
54822b8fc8 Move ajax actions to the front
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 21:50:30 +11:00
Madhura Jayaratne
10de07bb1d Fix #11617 Getting real row count is not allowed for views
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 21:48:14 +11:00
Madhura Jayaratne
ca2eb9d738 Make PHPCS happy
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-29 07:37:55 +11:00
Marc Delisle
0521553412 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-28 10:29:30 -04:00
Madhura Jayaratne
38ce691b70 Merge branch 'QA_4_5' 2015-10-28 20:27:53 +11:00
Madhura Jayaratne
4b4f032046 Fix #11614 Undefined variable: db
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-28 18:42:34 +11:00
Marc Delisle
973283cd0c Fix typo in property name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-27 10:22:30 -04:00
Marc Delisle
1d0c502a2c Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-27 10:03:56 -04:00
Marc Delisle
b49a746d35 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-25 09:54:07 -04:00
Marc Delisle
faaec8e9f4 Refactor high-level parser calling into a function
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-22 12:07:45 -04:00
Hugues Peccatte
9698d301f8 Fix #11550 Regression in Find and replace
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-18 22:14:20 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-07 22:09:55 +02:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00
Marc Delisle
911217e6b4 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-06 07:33:41 -04:00
Madhura Jayaratne
1411ffaaef Merge branch 'QA_4_5' 2015-10-06 20:39:59 +11:00
Madhura Jayaratne
ea68442ca3 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 20:33:45 +11:00
Madhura Jayaratne
a56aaada17 Fix #11544 Notices about undefined indexes on structure pages of information_schema tables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-06 20:33:19 +11:00
Marc Delisle
be17cf15cb Merge branch 'QA_4_5' 2015-10-05 18:19:34 -04:00
Marc Delisle
ed8ba7b3d7 Fixes #11541 Missing arguments for PMA_Table::generateAlter()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-05 18:18:55 -04:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-03 10:14:29 -04:00
Hugues Peccatte
bd0d2b79db Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-01 18:19:18 +02:00
Marc Delisle
75acdb1344 Merge branch 'QA_4_5' 2015-10-01 11:29:29 -04:00
Marc Delisle
3df771238e Fixes #11524 Yellow star does not change in database Structure after add/remove from favorites
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-01 11:28:29 -04:00
Madhura Jayaratne
11981e8bd9 Hide values column for HASH and KEY partition types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-01 07:08:14 +10:00
Hugues Peccatte
2960e6780a Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-30 22:05:24 +02:00
Madhura Jayaratne
d0efeac744 Allow adding and editing partitions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-30 21:18:04 +10:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Madhura Jayaratne
7ec4bcdbea Use include for files being included conditionally
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:11:11 +10:00
Hugues Peccatte
e23bbdf2a6 Set namespaces on GIS classes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 22:33:15 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:58 +10:00
Madhura Jayaratne
c196b189af Remove Drizzle support from table related functionalities
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:44 +10:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:39 +10:00
Hugues Peccatte
6c594eb0cf Fix calls.
Remove useless PHPDoc.
Add missing require.
Add missing 'use'.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-05 22:58:47 +02:00
Hugues Peccatte
17274d9a54 Move PMA/DI namespace to PMA\libraries\di.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-02 22:02:46 +02:00
Hugues Peccatte
32fd26ad42 Merge branch 'master' into useNamespaces_master 2015-09-02 21:48:40 +02:00
Madhura Jayaratne
9843e00e7b Merge branch 'QA_4_5' 2015-09-02 23:01:15 +10:00
Madhura Jayaratne
5916f3b8da Fix #11454 Find and replace is broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-02 22:58:58 +10:00