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

99665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
6fc418eb02 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-13 08:24:04 +05:30
Madhura Jayaratne
b4007f12da Revert 86c740bc57. This is being referred 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:23:07 +05:30
Madhura Jayaratne
b9ab876cdc Avoid fetching these data on file inclusion, rather fetch them when required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:19:24 +05:30
Madhura Jayaratne
86c740bc57 Fetch this only when it is required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:14:15 +05:30
Marc Delisle
49880f0d5d Fix param type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:44:02 -04:00
Marc Delisle
5027f6a4e2 Fix execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:39:10 -04:00
Marc Delisle
268c71deac Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:32:01 -04:00
Marc Delisle
8a3f61c074 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:05:44 -04:00
Marc Delisle
72cb48c89e Fix coding style and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 13:14:59 -04:00
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
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
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
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
Marc Delisle
8d03fe316a Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 09:56:04 -04:00
Madhura Jayaratne
4fd6ac5983 Remove more 'noclick' classes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 12:05:27 +05:30
Madhura Jayaratne
3cd8408971 Shift+click for tracking version table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:59:42 +05:30
Madhura Jayaratne
fc5d0688b3 Shift+click selection for db tracking page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:54:03 +05:30
Madhura Jayaratne
cf981cf3d0 Work properly when there are multiple tables in a page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:53:24 +05:30
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
Madhura Jayaratne
6f9f2084d5 Merge pull request #1670 from madhuracj/bug4512 
bug #4512 ForceSSL Redirect Check
 2015-05-12 07:19:17 +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
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
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
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