Commit Graph

117 Commits

Author SHA1 Message Date
Michal Čihař
7b08da151e Merge branch 'QA_4_6' 2016-04-26 12:50:59 +02:00
Michal Čihař
54b38e2999 Share js code for hostname input and fix it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-26 12:50:42 +02:00
Michal Čihař
0cd7caee71 Share js code for username input and fix it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-26 12:50:42 +02:00
Michal Čihař
6fdb046f9b Move javascript code for password to functions.js
- This allows to share the code
- Also fixed bad references to fields

Fixes #12217

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-26 12:50:42 +02:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-03 14:32:14 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-04 16:35:28 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-31 08:09:47 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-12-11 23:21:54 +01:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files.
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:39 +01:00
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5'
Conflicts:
	js/messages.php
2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-09 10:06:49 +11:00
Hugues Peccatte
92bb13c78c Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:05:39 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
3eea07d2ad Make scrutinizer happy
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-04 11:11:24 -04:00
Marc Delisle
fd7c8522ea Clarify method name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-03 10:14:29 -04:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes.
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:22:52 +02:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-26 16:57:42 +10:00
Hugues Peccatte
6bb56cf491 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-24 21:03:10 +02:00
Marc Delisle
3be360f062 Improve a message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-31 07:06:31 -04:00
Madhura Jayaratne
9b0b23cbfe Do not jump to the top of the page when clicking on these links to open a section
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-28 13:31:13 +05:30
Hugues Peccatte
56c07e6f35 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-25 22:51:02 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Madhura Jayaratne
31d29835e9 Add select all to database selector in replication gui
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-09 10:53:55 +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
a22bb26d7e Remove extra space after doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-28 10:42:21 +05:30
Martin Riedl
fa4421ed38 Fix initial replication configuration
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-16 09:54:46 -05:00
Hugues Peccatte
026c31fab6 Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:59:19 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-01 22:07:18 +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
a540e6ba87 More fixes to new PMA_URL_getCommon style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:39 +02: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
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
Igor Prokopenkov
d052fd0c51 Fix: broken skip slave error functionality
libraries/replication_gui.lib.php:908
function PMA_handleControlRequest()
checks for
if (isset($_REQUEST['sr_take_action']))
libraries/replication_gui.lib.php:202
but sr_take_action variable isn't included in $slave_skip_error_link generation

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-15 21:34:09 +03:00
Hugues Peccatte
ff0011ac3f Merge pull request #1353 from Tithugues/securityStringSquash
Mass modifications to use PMA_String.
2014-09-06 19:15:06 +02:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +02:00
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
Igor Prokopenkov
b497324ad6 Removed trailing whitespace
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-02 15:13:39 +03:00
Igor Prokopenkov
5a5bd3e535 Fixed undefined index notices
Fixed misspelling in the comment

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-02 15:06:54 +03:00
cmyker
06e8b65738 Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-master/replication/multi-source-replication/
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-02 13:52:09 +03:00
Ann + J.M
fea0fe03ef Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-04 18:02:44 +02:00
Marc Delisle
673fce8145 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-03 12:33:25 -04:00
Madhura Jayaratne
9079749206 Fix coding style violations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-10 13:12:03 +02:00
Michal Čihař
c5cc523b6d Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:19:15 +01:00
Michal Čihař
b8ca36653d Get rid of message concatenation the translation is then usually wrong
Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-01-23 10:56:29 +01:00
Madhura Jayaratne
84e9ce4946 Spaces around . operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 17:26:27 +05:30
Marc Delisle
f76e308722 Code cleanup
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-22 06:31:29 -05:00
Hugues Peccatte
f8b9f66a5e Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 23:09:43 +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
Madhura Jayaratne
7cf1a744a7 Fix coding style
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-18 11:22:58 +05:30