Commit Graph

4100 Commits

Author SHA1 Message Date
Madhura Jayaratne
85064d4ae3 Merge branch 'QA_4_4' 2015-04-24 10:03:41 +05:30
Madhura Jayaratne
738b37477b bug #4869 Drop column action not asking to confirm
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 10:01:29 +05:30
Madhura Jayaratne
648e2e1120 Merge branch 'QA_4_4' 2015-04-24 06:08:20 +05:30
Madhura Jayaratne
ef3b023c63 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 06:06:50 +05:30
Madhura Jayaratne
b4cddffe9d bug #4870 Inconsistency in 'Ignore' checkbox in insert page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 06:05:01 +05:30
Marc Delisle
408675bb13 Merge branch 'QA_4_4' 2015-04-23 14:49:45 -04:00
Smita Kumari
4743362c60 fix bug #4867
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2015-04-24 00:02:51 +05:30
Madhura Jayaratne
8dc1fe4727 Merge branch 'QA_4_4' 2015-04-23 12:48:26 +05:30
Madhura Jayaratne
179e581475 bug #4866 Limit column ordering in index edit dialog
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 12:47:03 +05:30
Marc Delisle
5c3b9c604f Fix JSHint warnings
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-21 09:47:18 -04:00
Madhura Jayaratne
9627e352b0 Merge branch 'QA_4_4' 2015-04-21 10:20:26 +05:30
Madhura Jayaratne
af2755217f bug #4859 Don't scroll (to bottom) when editing multiple rows
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-21 10:17:00 +05:30
Marc Delisle
6b44f39c21 Merge branch 'QA_4_4' 2015-04-17 08:41:43 -04:00
Smita Kumari
90336ba418 fix bug #4857
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2015-04-17 16:09:43 +05:30
Marc Delisle
e579ed1220 Use the dot notation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-16 14:20:40 -04:00
Madhura Jayaratne
d1b77a2949 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-15 09:00:32 +05:30
Madhura Jayaratne
91da1a8f38 Fix issues related to number of decimal places in time
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-15 08:55:44 +05:30
Madhura Jayaratne
ffac71c312 Consistently provide editing for procedures, functions, events and triggers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 12:18:56 +05:30
Marc Delisle
b01503a293 Merge commit '847fa85' 2015-04-10 09:55:11 -04:00
Marc Delisle
6f58a69511 Merge pull request #1638 from madhuracj/ob
Bug #4833 CSS and Javascript are not compressed - Work in progress
2015-04-10 09:52:50 -04:00
Madhura Jayaratne
df9eeabb91 Day can not be 00
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 11:08:02 +05:30
Madhura Jayaratne
7daabce97f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-10 11:00:59 +05:30
Madhura Jayaratne
6a611abf99 rfe #1653 New data validation feature and datetime type
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 10:59:26 +05:30
Marc Delisle
0065f72ba9 Merge pull request #1639 from whitepiegon/masterFeature2
reported bug removal for text field
2015-04-09 14:11:02 -04:00
Aayush Anand
2169a21a01 bug removal
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
2015-04-09 23:26:03 +05:30
Madhura Jayaratne
fd7eab22d7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-09 15:34:42 +05:30
Madhura Jayaratne
632ec90185 rfe #1643 No SQL query for loading data
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-09 15:33:44 +05:30
Madhura Jayaratne
847fa854e6 Output buffering for static JS
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-09 14:07:36 +05:30
Madhura Jayaratne
214e54ceec Output buffering for dynamic scripts
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-09 13:28:35 +05:30
Marc Delisle
966252d33b Merge branch 'QA_4_4' 2015-04-08 11:29:05 -04:00
sukhtaaj
68ef57a718 Prevents console window from moving out of the screen height
Signed-off-by: sukhtaaj <sukhtaaj@gmail.com>
2015-04-08 11:27:33 -04:00
Marc Delisle
148d6aef0e Merge pull request #1634 from whitepiegon/masterFeature2
clear any validation messages
2015-04-07 07:42:24 -04:00
Aayush Anand
95a5623a6c clear any validation message attempt2
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
2015-04-06 22:55:41 +05:30
Aayush Anand
27fdae5090 remove error message on checking checkbox
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
2015-04-06 10:55:42 +05:30
Marc Delisle
285d7cd594 Merge pull request #1633 from whitepiegon/masterFeature2
additional feature for form validation
2015-04-05 16:57:29 -04:00
Aayush Anand
053ca6029e additional feature for form validation
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
2015-04-05 21:39:40 +05:30
Marc Delisle
708736ab17 Merge pull request #1622 from whitepiegon/masterFeature2
#763 jquery validation feature
2015-04-05 05:09:32 -04:00
Aayush Anand
30ba4c3cd7 Feature 763 jquery validation feature squashed
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
2015-04-04 21:10:06 +05:30
Marc Delisle
46194cf6e9 Merge commit '68cb91e' 2015-04-04 05:42:45 -04:00
Deven Bansod
68cb91ee42 Tries to fix bug#4837
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-04-04 14:25:19 +05:30
Madhura Jayaratne
0a21c9b097 Merge branch 'QA_4_4' 2015-04-03 16:04:08 +05:30
Madhura Jayaratne
61432b77ea bug #4835 PMA_hideShowConnection not called after submit_num_fields
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 16:03:18 +05:30
Marc Delisle
77542d0b5a Merge branch 'QA_4_4' 2015-04-02 09:00:14 -04:00
Dan Ungureanu
502b91d861 BUG #4827. TEXT formatting does not work after inline editing.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-04-02 08:58:05 -04:00
Madhura Jayaratne
1a2fee8fbb Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-02 11:06:48 +05:30
Madhura Jayaratne
57e21caab1 bug #4828 JavaScript is loaded in wrong order
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-02 11:01:23 +05:30
Madhura Jayaratne
6f307e5db1 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-01 12:35:16 +05:30
Madhura Jayaratne
c5796e912f bug #4825 Datepicker missing when changing number of rows on Insert page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-01 11:58:00 +05:30
Marc Delisle
4f618b432c Make message translatable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-30 07:42:45 -04:00
Marc Delisle
c6052ace97 Merge pull request #1618 from pratiksethia1/minorCorrections
changes titles and minor correction
2015-03-30 07:33:03 -04:00