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

98665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sevdimali İsa
a92bea7afe Translated using Weblate (Azerbaijani) 
Currently translated at 58.1% (1764 of 3035 strings)

[CI skip]
 2015-05-15 03:46:44 +02:00
Stefano Martinelli
eef817da3c Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-14 16:31:46 +02:00
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
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
b5c51cf040 bug #4903 & bug #4367 Import status infinite loop 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 11:25:34 +05:30
Madhura Jayaratne
3addba490c Do not break the urls in the middle. Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 08:09:43 +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
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
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
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
2b41e09a48 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:55:53 -04:00
Tom Sommer
50616659e1 Don't throw errors in case reports.phpmyadmin.net is down 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:54:21 -04:00
Marc Delisle
969b46cca5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:46:51 -04:00
Tom Sommer
1684a1a56e Fix undefined index 'collation_connection' 
Make sure $GLOBALS[$collation] is set

Signed-off-by: Tom Sommer <mail@tomsommer.dk>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:45:50 -04:00
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
Madhura Jayaratne
6f9f2084d5 Merge pull request #1670 from madhuracj/bug4512 
bug #4512 ForceSSL Redirect Check
 2015-05-12 07:19:17 +05:30
drainx
50cf01057f Fix bug on result info display 
Reference image from : http://puu.sh/hIn2q/237524ef12.png for a text BLOB field.

Bisect determined 34c2837894 to be the cause.

Signed-off-by: Daniel Rix <Drainx1@live.com>
 2015-05-11 08:51:22 -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ř
254fc8faa8 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 11:00:45 +02:00
Michal Čihař
bdf4612081 Set User-Agent in Util::configureCurl 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 10:01:47 +02:00
Michal Čihař
de83138a89 Escape html chars in email 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 09:59:46 +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
Kristjan Räts
e484b5aca0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-11 09:19:06 +02:00
Madhura Jayaratne
47b734473e bug #4512 ForceSSL Redirect Check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-11 11:29:45 +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
Marc Delisle
683088a4b8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-09 06:17:24 -04:00
Marc Delisle
07dbc73a55 Merge pull request #1666 from nisargjhaveri/issue_4897 
Fix bug#4897
 2015-05-09 06:16:26 -04:00
Nisarg Jhaveri
4e9c3db67d Fix bug#4897 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-09 08:21:36 +05:30
Marc Delisle
b3a18956cf Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 14:49:41 -04:00
Marc Delisle
4db6481ea3 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 13:46:43 -04:00
Marc Delisle
b254c928da ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 11:36:55 -04:00
Nisarg Jhaveri
c8a4ed578b Prevent multiple request for SQL autocomplete 
Fix Bug#4858

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-08 11:36:04 -04:00
Marc Delisle
4c5592e632 Fix for PHP < 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 10:56:00 -04:00
Madhura Jayaratne
e60278b414 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:50:34 +05:30
Madhura Jayaratne
470d61abaf bug #4894 Deleting without confirmation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:40:47 +05:30
Madhura Jayaratne
34c2837894 bug #4896 Non-styled error page when following results link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 08:18:15 +05:30
Marc Delisle
822c4dfec2 bug #4876 Settings issues (Favorite tables shown twice in Settings) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 14:19:42 -04:00
Marc Delisle
5cb4292e6a 4.4.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:31:01 -04:00
Marc Delisle
504b80adbf phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:16:20 -04:00
Marc Delisle
53677b8e25 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 08:45:46 -04:00
Marc Delisle
9306a93bec phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 08:45:43 -04:00
Madhura Jayaratne
a0d8975544 Merge pull request #1663 from madhuracj/bug4891 
bug #4891 CSV Import ignores "Replace table data with file" checkbox
 2015-05-07 18:00:54 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Madhura Jayaratne
f7716754f4 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 07:54:12 +05:30
Madhura Jayaratne
1e6750cbc9 bug #4892 Undefined variable: unique_conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 07:51:16 +05:30
Marc Delisle
3e5eb604c6 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 15:15:23 -04:00
dingo thirteen
84e7513bf8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 21:07:51 +02:00
Marc Delisle
6dfd1c135c phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 13:24:50 -04:00