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

84 Commits

Author SHA1 Message Date
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
Marc Delisle
6731dcd198 Merge commit 'c8ac434' 2013-12-11 20:46:09 -05:00
Marc Delisle
c8ac434931 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 20:43:46 -05:00
Gemorroj
0232003ad2 accept license 
Signed-off-by: Gemorroj <wapinet@gmail.com>
 2013-12-11 20:32:36 -05:00
Gemorroj
b5210ba142 fix #4149 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 20:31:47 -05:00
Marc Delisle
92b8aad23e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-10 06:07:16 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
f4704c6c46 Coding style fixes 2013-11-10 07:22:59 +05:30
J.M
d1d4f9d87e Add HTML5 required attribute to input fields 2013-08-18 15:42:46 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
xmujay
239067f35f refactor server_replication 
1. refactor session  "Handling control requests"
2. fix code style problems
 2013-06-22 15:28:50 +08:00
xmujay
252a392592 1. change the function name 
2. fix Div function
3. using $_REQUEST when the variable is in the request list
 2013-06-22 01:32:17 +08:00
xmujay
cad22421ae 1. fix the undefine error 
2. add function to render same html tags
 2013-06-21 00:20:50 +08:00
xmujay
1044df611a refactor server_replication.php 
1. render HTML at once
2. split long functions
 2013-06-20 01:10:24 +08:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Kasun Chathuranga
03fc9b9256 PMA_is_system_schema --> PMA_isSystemSchema 2013-05-12 08:51:54 +05:30
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp 
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
 2013-05-01 00:51:15 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate 
In some languages this makes difference in translating, so it's better
to give translators full context.
 2013-04-25 14:22:31 +02:00
Rouslan Placella
a31140d159 Partial fix for bug #3583312 - Broken replication forms/links 2012-11-04 23:19:56 +00:00
Michal Čihař
3e050ff9d9 Various docblocks improvements 2012-09-19 15:05:26 +02:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Dieter Adriaenssens
3bbbe2e6a8 fix coding style : control structures 2012-08-30 17:25:42 +02:00
Chanaka Indrajith
a2b013522c Merge remote branch 'upstream/master' 2012-06-30 21:43:22 +05:30
J.M
c7e8afd0dc + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table 2012-06-30 18:09:12 +02:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Jo Michael
e8f21029e7 Added Generate Password button styling in pmahomme theme. 2012-03-16 19:06:39 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00