gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,615 Commits 12 Branches 481 Tags 2.4 GiB
bb1646dec7
Commit Graph

468 Commits

Author SHA1 Message Date
Michal Čihař
d71eae0969 Clarify message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-03 11:10:28 +02:00
Madhura Jayaratne
c21377d2da Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 08:29:25 +05:30
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
64d76a2afd Merge branch 'QA_4_4' 2015-07-17 11:43:55 +05:30
Madhura Jayaratne
42eff5d11a bug #4985 Column headers move when scrolling 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:37:03 +05:30
Marc Delisle
680d70af8b The "Sort by key" drop-down should have priority over the remembered sorting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-14 09:22:02 -04:00
Dan Ungureanu
fc6212b922 Improved documentation. 
Updated sql-parser library to udan11/sql-parser@0bff48a.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
889b49ee13 Refactored Table.class.php. 
Updated sql-parser library to udan11/sql-parser@b3eff80.
Fixed failing test.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
c8993af15a Wrong query flags array was tested. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
c34cf9ff29 More refactoring. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
684b4bed1a Finished replacing the old parser in DisplayResults. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
2826b6b328 More refactoring. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Dan Ungureanu
825cfbdc11 Fixed coding style. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:15 +03:00
Dan Ungureanu
46e44ed0d5 Replaced more of the old parser (2). 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:15 +03:00
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:06:28 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:03:57 +05:30
Madhura Jayaratne
9d4850c974 Syntax highlight settings_data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:33:58 +05:30
Marc Delisle
e093a33422 Merge branch 'QA_4_4' 2015-06-30 17:13:08 -04:00
Marc Delisle
66b4be9b74 bug #4972 Incorrect length computed for binary data 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-30 17:12:23 -04:00
Madhura Jayaratne
a759ac0185 Bug #4954 Warnings on query results refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 17:33:42 +05:30
Deven Bansod
ee6cd74ea3 Removed an unnecessary cell in printview. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-08 03:59:31 +05:30
Marc Delisle
00e27a6a7f Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-07 06:53:33 -04:00
Madhura Jayaratne
739b142580 Performance improvements: Minimize row unique condition calculation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 12:35:41 +05:30
Madhura Jayaratne
3e038dcaf9 Store only the where clause 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 11:47:09 +05:30
Madhura Jayaratne
80ad726a84 Performance improvements: Get unique row condition only when row edit, delete icons are displayed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 11:40:43 +05:30
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 03:57:50 +05:30
Madhura Jayaratne
19f8048bee Merge branch 'QA_4_4' 2015-05-29 11:32:09 +05:30
Madhura Jayaratne
02a6541e46 bug #4905 Sorting by an alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 11:29:59 +05:30
Marc Delisle
2f719fae41 Fix parameter default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 15:16:04 -04:00
Marc Delisle
64a7ab3c9d bug #4922 "Sort by key" drop-down value is lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 14:34:46 -04:00
Marc Delisle
2b7e038f94 Initialize variable; improve comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 10:19:23 -04:00
Madhura Jayaratne
a59ffb9654 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:04:43 +05:30
Madhura Jayaratne
6e69012eb4 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:01:57 +05:30
Hugues Peccatte
5130e854d5 Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:26:35 +02:00
Marc Delisle
857f8fce46 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 14:29:11 -04:00
Marc Delisle
bb8a420d8c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 13:56:39 -04:00
Marc Delisle
94a226c092 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-13 08:59:33 -04:00
Madhura Jayaratne
ad32e09ed0 Indicate that these have been truncated 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 10:44:12 +05:30
Marc Delisle
49880f0d5d Fix param type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:44:02 -04:00
Marc Delisle
5027f6a4e2 Fix execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:39:10 -04:00
Marc Delisle
268c71deac Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:32:01 -04:00
Marc Delisle
8a3f61c074 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:05:44 -04:00
Marc Delisle
72cb48c89e Fix coding style and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 13:14:59 -04:00
Marc Delisle
8d03fe316a Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 09:56:04 -04:00
drainx
50cf01057f Fix bug on result info display 
Reference image from : http://puu.sh/hIn2q/237524ef12.png for a text BLOB field.

Bisect determined 34c2837894 to be the cause.

Signed-off-by: Daniel Rix <Drainx1@live.com>
 2015-05-11 08:51:22 -04:00
drainx
02e7c7cf5b Fix bug on result info display 
Reference image from : http://puu.sh/hIn2q/237524ef12.png for a text BLOB field.

Bisect determined 34c2837894 to be the cause.

Signed-off-by: Daniel Rix <Drainx1@live.com>
 2015-05-10 12:01:55 -05:00
Marc Delisle
879a609774 Merge branch 'QA_4_4' 2015-05-08 10:56:26 -04:00