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

9197 Commits

Author SHA1 Message Date
Madhura Jayaratne
9ba6455a82 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:07:12 +05:30
Madhura Jayaratne
0ac438a081 ChangeLog entry for bug #4912 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:05:30 +05:30
Madhura Jayaratne
52f8f6080e ChangeLog entry for bug #4913 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:00:27 +05:30
Madhura Jayaratne
c4517f98c9 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:16:43 +05:30
Madhura Jayaratne
9294bf9ce1 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:11:05 +05:30
Madhura Jayaratne
af08e1417e bug #4911 Lock page icon is not shown after fresh reload 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:08:49 +05:30
Marc Delisle
6806ccbd2d Merge branch 'QA_4_4' 2015-05-19 09:00:35 -04:00
Marc Delisle
d90ee5d49c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-19 09:00:10 -04:00
Madhura Jayaratne
75d5890022 bug #4910 Slowness due to large number of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:00:13 +05:30
Isaac Bennetch
f7d50335bc Changelog for rfe 657 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-18 23:43:52 -04:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Madhura Jayaratne
74a9200c60 rfe #1671 Directly show table comments in structure view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 19:31:50 +05:30
Madhura Jayaratne
6c52f2318c Merge branch 'QA_4_4' 2015-05-18 10:30:00 +05:30
Madhura Jayaratne
34f318e52d Allow accessing visual query builder when pmadb is not configured 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 10:28:57 +05:30
Marc Delisle
ecaf6fac75 4.4.7 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-16 06:58:37 -04:00
Marc Delisle
95ac6b46dd 4.4.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-16 06:57:15 -04:00
Madhura Jayaratne
d40dbefe23 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:19:43 +05:30
Madhura Jayaratne
23341a3458 ChangeLog entry for bug #4906 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:17:21 +05:30
Madhura Jayaratne
b2a3d6cfb2 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:19:13 +05:30
Madhura Jayaratne
1257f2c714 bug #4904 Setup: Overview > Display does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:16:16 +05:30
Madhura Jayaratne
f30648779c rfe #1669 Designer: "Sticky" menu option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 18:17:45 +05:30
Madhura Jayaratne
479f62f551 Merge branch 'QA_4_4' 2015-05-14 14:18:24 +05:30
Madhura Jayaratne
35c7c6019e bug #4902 Designer: Loading does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 14:16:41 +05:30
Madhura Jayaratne
9207b67264 Missing ChangeLog entry in master 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 12:47:17 +05:30
Madhura Jayaratne
c2eefac419 Merge branch 'QA_4_4' 2015-05-14 11:30:17 +05:30
Madhura Jayaratne
ef806b39e5 ChangeLog entry for bug #4367 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 11:27:17 +05:30
Madhura Jayaratne
bdf66cd772 Merge branch 'QA_4_4' 2015-05-14 07:10:10 +05:30
Madhura Jayaratne
85f62badea Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-14 06:53:36 +05:30
Madhura Jayaratne
5ca7f19d05 Invalid value for CURLOPT_SSL_VERIFYPEER 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 06:52:26 +05:30
Marc Delisle
57eec4e32a Merge branch 'QA_4_4' 2015-05-13 11:38:22 -04:00
Marc Delisle
061483ac1f 4.4.6.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-13 11:37:55 -04:00
Madhura Jayaratne
e874e59b69 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:36:06 -04:00
Madhura Jayaratne
787c6d6445 bug #4900 [security] Vulnerability allowing man-in-the-middle attack 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:29:15 -04:00
Madhura Jayaratne
d6afe6ccf6 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:28:19 -04:00
Madhura Jayaratne
fd687aad4b Merge branch 'QA_4_4' 2015-05-13 14:03:19 +05:30
Madhura Jayaratne
50b2985a3e bug Escape database and table names for partition maintenance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 14:01:48 +05:30
Marc Delisle
75d9fd93a1 Merge branch 'QA_4_4' 2015-05-12 11:56:34 -04:00
Marc Delisle
2b41e09a48 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:55:53 -04:00
Marc Delisle
4426af36b1 Merge branch 'QA_4_4' 2015-05-12 11:47:21 -04:00
Marc Delisle
969b46cca5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:46:51 -04:00
Madhura Jayaratne
819f01f8a3 rfe #1668 Procedures window shift-click should select multiple rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:44:46 +05:30
Madhura Jayaratne
286b31c71d Merge branch 'QA_4_4' 2015-05-12 07:24:15 +05:30
Madhura Jayaratne
9cb7f30ee8 ChangeLog entry for bug #4512 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 07:22:19 +05:30
Isaac Bennetch
8a6a51e374 Changelog for RFE 1485 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-11 10:37:34 -04:00
Marc Delisle
f4a2dce952 Merge branch 'QA_4_4' 2015-05-11 07:58:51 -04:00
Marc Delisle
1b96621d1b Missing title on link 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-11 07:58:17 -04:00
Michal Čihař
3c5df878a7 Merge remote-tracking branch 'origin/QA_4_4' 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	libraries/Config.class.php
 2015-05-11 10:03:58 +02:00
Michal Čihař
f3901b7ef7 Make PMA_Config::checkHTTP honor proxy settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 09:59:09 +02:00
Madhura Jayaratne
f224cabeda Merge branch 'QA_4_4' 2015-05-11 10:40:28 +05:30
Madhura Jayaratne
3fed053d68 bug #4898 JS error after selecting a field and press Enter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-11 10:38:17 +05:30