Commit Graph

9025 Commits

Author SHA1 Message Date
Madhura Jayaratne
0b57843356 rfe #1651 Allow copying mutiple rows
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-08 12:52:43 +05:30
Madhura Jayaratne
1c52bc2a81 rfe #1650 Support a default page in designer
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-08 10:15:27 +05:30
Michal Čihař
fd5cdbaab0 Merge commit '25a05bd6c81e0b938586e22e4a5eb229df99b01e' 2015-04-07 15:21:04 +02:00
Madhura Jayaratne
25a05bd6c8 MIME Transformation link fixed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-07 18:08:43 +05:30
Marc Delisle
7572ed93bd Merge branch 'QA_4_4' 2015-04-07 08:07:46 -04:00
Marc Delisle
d3666a26f8 4.4.1 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-07 08:06:15 -04:00
Madhura Jayaratne
8af521f550 Merge branch 'QA_4_4' 2015-04-07 10:28:38 +05:30
Madhura Jayaratne
7c4d8b55e4 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-07 10:24:45 +05:30
Madhura Jayaratne
63570bc30f bug #4841 Status page: Mislukte pogingen per uur value is incorrect
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-07 10:20:12 +05:30
Marc Delisle
0afa5817d2 Merge branch 'QA_4_4' 2015-04-06 07:28:30 -04:00
Marc Delisle
a4f2cf923c ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-06 07:27:36 -04:00
Marc Delisle
697f64be62 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-05 05:25:30 -04:00
Marc Delisle
d113704898 Merge branch 'QA_4_4' 2015-04-04 05:43:09 -04:00
Marc Delisle
156efafcd2 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-04 05:41:48 -04:00
Madhura Jayaratne
950d4ff3c2 Merge branch 'QA_4_4' 2015-04-03 18:54:55 +05:30
Madhura Jayaratne
c5260bb56d bug #4836 Server warning after moving from console to direct clicks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 18:53:31 +05:30
Marc Delisle
64c9195393 4.4.2-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-03 07:30:43 -04:00
Marc Delisle
ed6976a83e This fix goes to 4.4.2
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-03 07:29:22 -04:00
Marc Delisle
bc7629f5f9 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-04-03 07:27:16 -04:00
Marc Delisle
14941285b9 4.4.2-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-03 07:27:13 -04:00
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
Madhura Jayaratne
8b1cbaf988 rfe #1635 Have ZeroConf create phpmyadmin DB if possible
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 15:32:36 +05:30
Madhura Jayaratne
927b95bc23 Merge branch 'QA_4_4' 2015-04-03 12:29:43 +05:30
Madhura Jayaratne
744e9f42e4 bug #4834 Do not attach token to css requests to improve caching
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 12:28:50 +05:30
Madhura Jayaratne
dc07fb8b3b Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 10:29:18 +05:30
Madhura Jayaratne
7b16d62d09 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-03 10:27:07 +05:30
Madhura Jayaratne
8d8a90288a bug #4832 Sorting distinct values result loses links
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 10:25:29 +05:30
Marc Delisle
f9d76e39e0 Merge branch 'QA_4_4' 2015-04-02 16:11:25 -04:00
Marc Delisle
8d16b2d937 bug #4822 Compress when php.ini output_buffering is active
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-02 16:10:34 -04:00
Marc Delisle
d208cb47d6 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-02 15:37:11 -04:00
Marc Delisle
77542d0b5a Merge branch 'QA_4_4' 2015-04-02 09:00:14 -04:00
Marc Delisle
e70a4f92a5 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-02 08:59:38 -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
Marc Delisle
72d71c9da3 Merge branch 'QA_4_4' 2015-04-01 12:28:46 -04:00
Marc Delisle
a26d4892e5 4.4.0 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-01 12:28:07 -04:00
Marc Delisle
ddeb39bcf8 Merge branch 'QA_4_4' 2015-04-01 08:10:55 -04:00
Marc Delisle
c6e8a4d35c ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-01 08:10:10 -04:00
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
e359257303 Merge branch 'QA_4_4' 2015-03-31 10:02:10 -04:00
Madhura Jayaratne
0f720c5375 bug #4754 pMA DB not detected properly
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-31 18:52:38 +05:30
Marc Delisle
d230d78bb2 Merge commit 'e3735f9' 2015-03-30 08:33:29 -04:00
Marc Delisle
e3735f951c Merge pull request #1619 from madhuracj/bug4821
bug #4821 Timed-out import fails to restart when file represented
2015-03-30 08:29:58 -04:00
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-30 16:01:51 +05:30
Marc Delisle
9b403471e7 4.3.13 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-29 09:05:39 -04:00
Marc Delisle
3b8c3ebeca 4.3.13 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-29 09:04:18 -04:00
Marc Delisle
6c7c9dc7c3 Merge branch 'QA_4_4' 2015-03-29 07:59:30 -04:00
Marc Delisle
b28ae18f22 Merge branch 'QA_4_3' into QA_4_4 2015-03-29 07:57:31 -04:00