Dhananjay Nakrani
76c57710f0
Display session expiry msg after auto-redirect.
...
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
2014-03-03 11:49:17 +05:30
Marc Delisle
93db7fac2d
Merge commit 'd2dbe10'
2014-03-02 09:41:13 -05:00
Marc Delisle
b50ed1aac4
Merge commit '65e24c0'
2014-03-02 09:41:02 -05:00
Atul Pratap Singh
872e4d039b
Merge branch 'QA_4_1'
2014-03-03 01:33:29 +05:30
Smita Kumari
d2dbe10b5a
unbinding keyup event
...
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-03-02 18:44:05 +05:30
Viduranga Wijesooriya
820bd6ad6e
fixed #4300 Grid edit textfield: can't place cursor or select text with mouse
...
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-03-02 14:48:50 +05:30
Atul Pratap Singh
c50e0a22d9
Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1
2014-03-01 23:51:23 +05:30
Atul Pratap Singh
54ee8faa96
Fix error reports 974/1833: cannot call method on tooltip
...
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-03-01 23:36:45 +05:30
Atul Pratap Singh
987ab29858
Fix error reports 477/1573/1604: unrecognized expression: input:checkbox
...
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-03-01 23:22:05 +05:30
Atul Pratap Singh
69e504ccf8
Fix error reports 1678/1757 chartObj.chart.series[j].setData is not a function
...
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-03-01 19:01:25 +05:30
Marc Delisle
6c2e46d6c7
Merge pull request #974 from WhaleWatching/fix_jqplot
...
Fix jqplot display
2014-03-01 07:21:30 -05:00
Marc Delisle
46b3419977
Merge commit '431c2ad'
2014-02-28 15:15:19 -05:00
Michal Čihař
2bacdef4f4
Drop non js behavior of export chooser
...
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-28 08:51:58 +01:00
Sampath Liyanage
431c2ad5d8
DB Search bug fix
...
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-02-28 01:50:33 +05:30
Marc Delisle
865f6e4e17
Merge pull request #959 from vpowerrc/bug-#4281
...
fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value
2014-02-27 12:58:29 -05:00
Edward Cheng
9ba932077e
Fix jqplot display
...
Add clearfloat before jqplot element.
Fix bug: legend overflow.
Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-02-27 22:28:05 +08:00
Chirayu Chiripal
dec30ffd6d
Feature Request #1460 Redirect to login page after session has expired
...
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-02-27 17:45:46 +05:30
Smita Kumari
65e24c0b0a
bug fix #4298 : added javascript allow just one character if first character is not escape character else allow two including escape character
...
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-02-27 00:21:03 +05:30
Marc Delisle
9a18b579c3
Fix merge conflict
...
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-26 12:47:22 -05:00
Viduranga Wijesooriya
1c732b783b
re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value
...
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-25 19:35:02 +05:30
Viduranga Wijesooriya
07dd92c5be
bug-#4281 reset the position of the edit_area div after closing datetime picker
...
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-25 19:29:38 +05:30
Viduranga Wijesooriya
6c22b4d4b9
re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value
...
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-25 19:16:42 +05:30
Marc Delisle
211d3a16ab
Merge commit '2ca5735'
2014-02-24 16:10:53 -05:00
Marc Delisle
3d3dd1c7b5
Merge commit '7baa79c'
2014-02-24 16:10:41 -05:00
Marc Delisle
8889e787ea
Merge pull request #954 from omerjerk/QA_4_1
...
BugFix #4294
2014-02-24 16:10:56 -05:00
Hugues Peccatte
1fa4cdf800
Add confirmation before deletion.
...
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-24 19:56:38 +01:00
Viduranga Wijesooriya
7dae314aa3
fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value
...
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-24 22:39:21 +05:30
Umair Khan
2ca5735443
Fix empty filename during export
...
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2014-02-24 18:21:17 +05:30
Marc Delisle
095883bd56
Merge commit '33a333f'
2014-02-24 07:43:48 -05:00
Marc Delisle
68929a13e5
Merge pull request #923 from dhananjay92/Bug#4279
...
Fix For Bug#4279
2014-02-24 07:41:28 -05:00
Michal Čihař
c20ed3e970
Place comment for translators in a place where gettext finds it
...
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 10:00:04 +01:00
Hugues Peccatte
8b84cf0d91
Feature #569 Load/Save Query By Example
...
Implement possibility to save/load/delete a QBE on a DB.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-23 14:52:48 +01:00
Marc Delisle
1c6de75355
Merge commit 'f63edbe'
2014-02-21 12:28:12 -05:00
Marc Delisle
88b0f0ff9e
Merge commit 'e4ebdc9'
2014-02-21 12:28:03 -05:00
Marc Delisle
9ce1d34751
Merge commit '1b4908a'
2014-02-21 12:27:51 -05:00
Marc Delisle
0186cb40ff
Merge pull request #953 from mebjas/QA_4_1
...
Replication of bug #4292 in inline sql edit
2014-02-21 12:25:30 -05:00
Umair Khan
7baa79c28c
BugFix #4294
...
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2014-02-21 00:14:18 +05:30
minhaz
f63edbe26a
coding style fix - for bug 4293
...
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-02-21 00:01:33 +05:30
minhaz
e4ebdc9d63
Bug fix 4293
...
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-02-20 23:57:11 +05:30
minhaz
1b4908abac
Replication of bug #4292 in inline sql edit
...
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-02-20 21:50:16 +05:30
Marc Delisle
0fb3b29f72
Merge branch 'QA_4_1'
2014-02-20 06:49:09 -05:00
minhaz
2c7ba06ab7
bug fix #4292
...
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-20 06:45:14 -05:00
Umair Khan
5617a95e70
Implement feature #1505
...
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-19 06:06:46 -05:00
Michal Čihař
b71192c5d9
Merge pull request #947 from m0hamed/fix/exception_without_name
...
Exceptions without a name may get a name extracted out of the message
2014-02-19 09:51:43 +01:00
Marc Delisle
519e65960c
Merge pull request #946 from WhaleWatching/nav_hover_show_full
...
Bug fix
2014-02-18 13:00:50 -05:00
Mohamed Ashraf
f40360c567
Exceptions without a name may get a name extracted out of the message
...
Signed-off-by: Mohamed Ashraf <mohamed.ashraf.213@gmail.com>
2014-02-18 17:54:03 +02:00
Michal Čihař
f396eac331
Merge pull request #930 from WhaleWatching/imp_nav_ani
...
Improve navigation .list_container animation
2014-02-18 14:08:06 +01:00
Marc Delisle
f2baed581c
Merge commit '7bd12ad'
2014-02-18 06:20:54 -05:00
Edward Cheng
8ba06fc545
Bug fix:
...
When cursor pass <code>#full_name_layer</code> with a high speed, <code>#full_name_layer</code> will resides in page
Now it'll disappear.
Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-02-18 09:01:59 +08:00
Michal Čihař
bb69b9162e
Add missing semicolon
...
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-17 19:37:36 +01:00