gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,290 Commits 12 Branches 481 Tags 2.4 GiB
77fec70ee8
Commit Graph

192 Commits

Author SHA1 Message Date
Madhura Jayaratne
fefb11eb87 bug #4646 Version Check Broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 15:45:09 +05:30
Marc Delisle
ed6ba4210f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:10:08 -05:00
Marc Delisle
9af3635c26 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:09:18 -05:00
Marc Delisle
02fcb6e746 Add FAQ reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:04:11 -05:00
Madhura Jayaratne
99ef493ebb bug #4057 db/table query string parameters no longer work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 15:48:37 +05:30
Michal Čihař
05f01d9c2a Split HTML markup from translatable string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-04 10:47:50 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-04 10:09:06 +02:00
Chanaka Dharmarathna
4e68ada908 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-04 11:40:39 +05:30
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
ea1f826f46 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-23 13:51:56 -04:00
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
6cadd6ef31 Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-25 08:07:42 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Michal Čihař
51d4d514f9 Adjust tests to new encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Hugues Peccatte
b8ca923968 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-17 12:50:58 +02:00
Marc Delisle
3e3d7db2c0 Merge pull request #1129 from WhaleWatching/navigation 
Improve Navigation
 2014-04-08 10:15:57 -04:00
Marc Delisle
09b54ed19b Put back code lost since 2a8962aa95 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-08 10:03:58 -04:00
Chanaka Indrajith
a559543bfb Fixed method naming convention 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-04-08 00:36:55 +05:30
Edward Cheng
d74ac17cb4 Improve Navigation 
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Fix bugs.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-04-07 23:32:39 +08:00
Ashutosh Dhundhara
28b7b9031c Browser local storage support for Favorite tables feature. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed sync anchor location.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-02 18:20:29 +05:30
Ashutosh Dhundhara
e9d59fd7e0 Implemented Favorite tables feature with Ajax. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fixes in Settings->Features page and Navigation Header class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed translation issues in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Another fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 00:06:14 +05:30
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Marc Delisle
0cc0e0f3a1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-11 12:57:06 -05:00
Marc Delisle
3fa7915575 Merge commit '52084d8' 2014-02-11 12:53:32 -05:00
Marc Delisle
f7f98bbce9 Merge commit '9d66a52' 2014-02-10 13:10:23 -05:00
Dhananjay Nakrani
52084d839c Fix for Bug#4275 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 14:06:36 +05:30
Dhananjay Nakrani
9d66a521a1 Contest-5 Bug#4276. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 13:26:33 +05:30
Madhura Jayaratne
3c9f6a6890 Space around . operator - mroe instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:56:30 +05:30
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Hugues Peccatte
8665639bb0 Review of modifications 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-05 11:05:32 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables. 
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-04 20:46:18 +01:00
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:51 +01:00
Marc Delisle
99b477ffd4 Fix merge conflicts 2013-10-06 09:40:17 -04:00
Marc Delisle
a498a6c8cb bug #3995 Drizzle server charset notice 2013-10-06 09:32:24 -04:00
Madhura Jayaratne
3b17233f25 Remove HTML, PHP mix 2013-09-24 16:58:51 +05:30
Marc Delisle
668c55a437 Fix merge conflicts 2013-09-24 06:55:16 -04:00
Marc Delisle
256fcb61fe bug #4099 Server/library difference warning: setting is ignored 2013-09-24 06:49:39 -04:00
Marc Delisle
5e70597251 Fix codestyle 2013-09-08 06:51:58 -04:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
351acd74af Demo server support 
This merges messages used in demo server to allow their translations and
consistent handling like other messages. Messages are enabled by
$cfg['DBG']['demo'].
 2013-07-30 14:09:06 +02:00
Michal Čihař
285a9a0f3f Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 10:18:05 +02:00
Michal Čihař
4da684e7b6 Fixed escaping in error message asking for translations 2013-07-30 10:17:32 +02:00