Commit Graph

806 Commits

Author SHA1 Message Date
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Viduranga Wijesooriya
2453a15174 #1498 Add timepicker for 'TIME' type
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-03 09:28:20 +05:30
Marc Delisle
82a549714e Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-31 08:22:29 -05:00
Marc Delisle
2bca34d2f8 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-31 08:10:08 -05:00
Atul Pratap Singh
27143a758c Merge branch 'QA_4_1' 2014-01-31 15:25:27 +05:30
Atul Pratap Singh
b7dfae03b9 Fix bug#4266: error_reporting: cannot call methods on widget(tooltip) prior to initialization
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-31 15:18:23 +05:30
Viduranga Wijesooriya
8cc01b38ae bug#4257 - fixed test failures
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-31 12:09:46 +05:30
Viduranga Wijesooriya
2f2dd3b548 bug#4257 - refixed datetimepicker view of record edit page
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-31 01:58:33 +05:30
Viduranga Wijesooriya
b93e426998 bug#4257 - fixed datetimepicker view of record edit page
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-31 01:52:52 +05:30
Viduranga Wijesooriya
d483b9f03a fixed bug #4257 Hide fractional seconds
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-30 16:09:55 +05:30
Atul Pratap Singh
5886bc412c version info was being added multiple times
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-21 16:58:00 +05:30
Atul Pratap Singh
14a031cee7 version info was being added multiple times
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-20 10:38:17 +05:30
Marc Delisle
e4ff92dc0a Improve variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-04 19:10:51 -05:00
Marc Delisle
7c7edc1f67 Improve variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-04 19:08:20 -05:00
Madhura Jayaratne
9b03425c64 Merge branch 'QA_4_1' 2013-12-22 15:13:17 +05:30
Madhura Jayaratne
491059843f bug #4187 SQL query inline edit doesn't post changes on the first run
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-22 15:11:44 +05:30
Marc Delisle
b39b0e5e09 Fix typo 2013-12-01 09:39:09 -05:00
Margus Lind
05c4e0c8cc Removed constraints from datetime and timestamp input boxes ( added constrainInput:false option) 2013-11-08 09:37:10 +02:00
Atul Pratap Singh
fd2ab2ea40 Merge branch 'QA_4_0'
Conflicts:
	sql.php
2013-10-28 02:36:46 +05:30
Atul Pratap Singh
c2f48525dc Fix bug#4059: Running delete query asks for confirmation but says it was already executed 2013-10-28 01:53:50 +05:30
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Madhura Jayaratne
531950b73a Fix duplicate IDs. Remove bookmark section when there are no bookmarks 2013-10-18 10:44:40 +05:30
Michal Čihař
50deebcbdf Coding style: Bad line breaking before logical operators 2013-10-02 12:07:15 +02:00
Michal Čihař
eb86ce0416 Coding style: whitespace around operators 2013-09-30 11:25:23 +02:00
Marc Delisle
00b20b70e8 Merge branch 'QA_4_0' 2013-09-22 09:55:59 -04:00
Marc Delisle
509970d9e8 bug #4002 Edit Index on big table does not show "Loading" or any message 2013-09-22 09:55:12 -04:00
Marc Delisle
a5f20214fe Js confirm for drop view in Operations 2013-09-17 11:03:00 -04:00
Isaac Bennetch
fa87bcec06 Merge pull request #582 from kasunchathuranga/fractionalSecs
Use fractional seconds in time, datetime and timestamp
2013-08-27 06:37:30 -07:00
Marc Delisle
3df8d3db6b bug #4056 Language: Vague error message when adding a varchar field 2013-08-18 06:15:58 -04:00
Kasun Chathuranga
b495061cdf Use fractional seconds in time 2013-08-10 11:26:43 +05:30
Michal Čihař
151d8566e8 Document functions 2013-08-07 10:28:56 +02:00
Michal Čihař
2e03f81633 Doc links only with CodeMirror enabled 2013-08-07 10:27:46 +02:00
Michal Čihař
dd5fd448d6 Properly set target for MySQL doc links 2013-08-07 10:26:55 +02:00
Michal Čihař
2822419f10 Show docs for multiword statements as well 2013-08-07 10:25:39 +02:00
Michal Čihař
1102d68c39 Documentation for types 2013-08-07 09:35:22 +02:00
Michal Čihař
b4dc0213e6 Add infrastructure for doc links in SQL highlighter 2013-08-07 09:28:19 +02:00
Dirk-jan
97849db1e7 Fix javascript error when codemirror is disabled 2013-08-06 17:03:02 +02:00
Michal Čihař
3e3620f22d Use dot notation 2013-07-29 09:29:12 +02:00
Michal Čihař
aaca8fc4c9 Define variable before using it 2013-07-29 09:28:33 +02:00
Michal Čihař
da81549411 Better readable code 2013-07-29 09:26:09 +02:00
Michal Čihař
a3d247ea59 Fixed newlines around + 2013-07-29 09:24:53 +02:00
Michal Čihař
3ef4d4cb2e Single declaration of a variable 2013-07-29 09:23:44 +02:00
Michal Čihař
22e018f998 Fixed newlines around || 2013-07-29 09:22:51 +02:00
Michal Čihař
fdc2ac7be5 Fixed newlines around && 2013-07-29 09:22:37 +02:00
Isaac Bennetch
63694eb049 Merge pull request #496 from kasunchathuranga/EditView
Edit a view
2013-07-12 10:04:01 -07:00
Dieter Adriaenssens
07f4d2d364 rename variable 2013-07-12 16:17:34 +02:00
Kasun Chathuranga
f2e214247c Use Codemirror editor for view editing 2013-07-12 09:56:01 +05:30
Kasun Chathuranga
c6c2eff784 Editing a view is likely to change view structure. So there is no point using an ajax dialog for that as view structure page need to be refreshed. 2013-07-12 09:38:53 +05:30
Kasun Chathuranga
bb6d69ab26 Merge branch 'master' into EditView 2013-07-09 22:15:41 +05:30
Kasun Chathuranga
7e2efa97b4 Do line wrapping for Codemirror editor 2013-07-11 18:02:59 +05:30