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

99639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
697fd7825f Merge pull request #1662 from devenbansod/rfe1485 
RFE #1485
 2015-05-11 09:55:58 -04:00
Marc Delisle
3e5987c199 Merge branch 'QA_4_4' 2015-05-11 08:51:52 -04:00
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
16702a4c1b Merge pull request #1668 from drainx/master 
Fix bug on result info display
 2015-05-11 08:49:44 -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ř
458f1d23de The testsuite should now work with recent phpunit as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 11:05:19 +02:00
Michal Čihař
dd22d2ab70 Merge remote-tracking branch 'origin/QA_4_4' 2015-05-11 11:00:59 +02:00
Michal Čihař
254fc8faa8 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 11:00:45 +02: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ř
0c91ae4417 Merge commit 'e484b5aca0138baa66469058434c9530ff92440c' 2015-05-11 10:02:48 +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
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
Deven Bansod
d00fe5cf6a RFE #1485 : Add a DROP/ COALESCE Partition option in Partition Maintenance 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-11 06:00:20 +05:30
drainx
02e7c7cf5b 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-10 12:01:55 -05:00
Marc Delisle
c0fde0ae7f Refactor checkClient() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-10 07:25:14 -04:00
Marc Delisle
054a7d4ff8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-10 06:19:51 -04:00
Marc Delisle
c6276ce151 Merge pull request #1667 from nisargjhaveri/col_hint 
Show hint for column autocomplete in better way
 2015-05-09 07:18:38 -04:00
Nisarg Jhaveri
93172dbc70 Show hint for column autocomplete in better way 
Separate column name and extra information in better way in
autocomplete

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-09 16:18:41 +05:30
Marc Delisle
93ebada51b Merge branch 'QA_4_4' 2015-05-09 06:18:02 -04:00
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
4d02033f47 Merge branch 'QA_4_4' 2015-05-08 14:50:05 -04:00
Marc Delisle
b3a18956cf Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 14:49:41 -04:00
Marc Delisle
7fd24d1644 Merge branch 'QA_4_4' 2015-05-08 13:47:10 -04:00
Marc Delisle
4db6481ea3 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 13:46:43 -04:00
Madhura Jayaratne
16fc314235 Fix more indentations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:17:42 +05:30
Madhura Jayaratne
b4b1f5edda Fix bad indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:14:18 +05:30
Madhura Jayaratne
af1f78902c Prefix private methods with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:11:15 +05:30
Madhura Jayaratne
1f6a2c53c5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-08 21:10:50 +05:30
Madhura Jayaratne
096535fa8a Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:09:41 +05:30
Marc Delisle
8d1bdb8228 Merge branch 'QA_4_4' 2015-05-08 11:37:39 -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
879a609774 Merge branch 'QA_4_4' 2015-05-08 10:56:26 -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
Marc Delisle
52b8aadd74 Refactor _setDisplayParts() due to excessive method length 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 09:44:50 -04:00
Marc Delisle
cfe8a00b1b Refactor _setDisplayParts() due to excessive method length 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 08:00:55 -04:00
Madhura Jayaratne
e3132374cc Merge branch 'QA_4_4' 2015-05-08 15:51:38 +05:30
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
c59aef5860 Merge branch 'QA_4_4' 2015-05-08 15:41:41 +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
f931072342 Use CodeMirror editor in query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 13:44:21 +05:30
Madhura Jayaratne
dc72faf6ab Specific condition for cell values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 10:02:19 +05:30
Madhura Jayaratne
02cbe875cc Merge branch 'QA_4_4' 2015-05-08 08:20:12 +05:30