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

334 Commits

Author SHA1 Message Date
Marc Delisle
c2e308cb1e bug #4647 Can't disable Favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 13:30:27 -05:00
Marc Delisle
ffa83ae0d7 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:55:43 -05:00
Marc Delisle
9555a21a3d Another instance of Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:53:20 -05:00
Michal Čihař
e92155b675 Check if set before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:49:38 +01:00
Marc Delisle
aeebf1052f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:54:16 -05:00
Madhura Jayaratne
f9272e7c4b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-26 18:53:23 +05:30
Marc Delisle
e38f5753ff Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:12:23 -05:00
Madhura Jayaratne
7332dbbdc0 Remove more duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:34:06 +05:30
Atul Pratap Singh
d533e98176 Fix bug#4586 Javascript error after moving a column 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-11-12 14:06:49 +05:30
Hugues Peccatte
8e6d16cf7e Merge pull request #1389 from Tithugues/replicationInfo_master 
Use $replication_info everywhere, instead of $server_* variables.
 2014-11-10 13:45:39 +01:00
Hugues Peccatte
1110aa3c0e Fix undefined variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 19:27:20 +01:00
Hugues Peccatte
b6f390ef09 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 19:20:55 +01:00
Hugues Peccatte
49836e6e6f Use $replication_info everywhere, instead of $server_* variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 16:30:07 +01:00
Hugues Peccatte
74ece2e220 Remove PMA_String::strpos call. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-04 21:23:24 +01:00
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +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
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02: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
Madhura Jayaratne
8059f3fff0 Merge pull request #1375 from madhuracj/DisableIS 
Performance improvements related to IS
 2014-10-16 18:49:18 +05:30
Madhura Jayaratne
492d0f133f Additional fix for bug #3869. Consider tables in information_schema as views to benefit from 'MaxExactCountViews' and avoid count(*) in information_schema tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-16 14:59:45 +05:30
Marc Delisle
32c1192351 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-14 12:12:49 -04: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
f9cd1a1a22 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 11:31:50 +02:00
Marc Delisle
115ec64b1d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-02 05:50:43 -04:00
Marc Delisle
45d234f638 Adapt to PMA_String 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:20:19 -04:00
Marc Delisle
faafea0bd1 Merge branch 'QA_4_2' 2014-09-30 13:14:14 -04:00
Marc Delisle
58cc1e5ae2 bug #4543 Changing column name can break saved "order by" clause 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:13:21 -04: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
6fd724cb24 Refactor duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-25 11:57:28 -04:00
Marc Delisle
ac08019ef4 Merge branch 'QA_4_2' 2014-09-25 08:18:43 -04:00
Marc Delisle
da6e5b6e8e bug #4542 Tab key in column name not shown 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-25 08:18:04 -04:00
Marc Delisle
0f74231fee rfe #1251 Show "Overhead" with same precision for all tables 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-24 15:54:17 -04:00
Marc Delisle
e35133c25e Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-10 07:29:45 -04:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 13:56:42 +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
Marc Delisle
ed6968eabc Add missing parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-21 09:04:28 -04:00
Marc Delisle
5a677a3ec4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-18 21:34:19 -04:00
Marc Delisle
6d3a919ee0 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-18 21:10:49 -04:00
Ashutosh Dhundhara
60610f9b83 Fix issues reported by Scrutinizer. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-17 02:20:05 +05:30
Marc Delisle
dbfc3acb1f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 16:51:26 -04:00
Marc Delisle
a483abec07 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-16 10:37:05 -04:00
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637 
RFE-637: Custom field handlers (input transformations)
 2014-07-12 09:45:35 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Marc Delisle
57475371a5 bug #4486 [security] XSS injection due to unescaped table comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 06:36:17 -04:00
Ashutosh Dhundhara
622bab8f06 Function says that it returns HTML. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-07-09 23:00:20 +05:30
Marc Delisle
ca4c37282e Merge pull request #1257 from smita786/gsoc_automated_normalizaion 
automated normalizaion to 1NF
 2014-06-30 15:44:09 -04:00
Smita Kumari
1e971f3263 1NF: initial commit 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

step 1 to 1NF complete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added layout for step2 and step3

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

basic 1NF complete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added doc comment

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

error handling plus during split shows my string type columns

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing unnecessory code

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing unnecessory code

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

code refactoring plus translatable message format

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added events on cancel and added unbind function calls

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

hide default textarea when value NONE

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove unnecesory alert

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

create unique column screen fixed plus starting link for normalization on tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added hint to follow steps carefully and finish message changes

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style plus messages

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added wand icon for normalization

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

bug fix: dont go next step if any index other than primary/unique is crated

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

bug fix: replace .live with .on plus others

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

change show central column message plus refresh central column list on split save

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-30 22:32:53 +05:30
Marc Delisle
f1b37d7ffc Fix incorrect parameter type definition 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:33:01 -04:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Ashutosh Dhundhara
3b24737d14 Bug: Escape table name. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-21 09:15:45 +05:30
Marc Delisle
9f37c3ddd7 Fix merge conflits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:44:51 -04:00
Marc Delisle
d51893b0b7 Clarify parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 13:01:38 -04:00
Marc Delisle
00bad7150b Merge pull request #1211 from smita786/gsoc_central_columns_list 
option to Make table consistent with central list of columns
 2014-06-09 12:27:40 -04:00
Smita Kumari
6b8575734c option to Make table consistent with central list of columns 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

make messages transtalable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Coding style fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Make confirmation button options translatable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-09 20:35:10 +05:30
Ashutosh Dhundhara
99b9e8d83c RFE#1145: Preview SQL instead of executing it. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-07 00:27:39 +05:30
Ann + J.M
cb7c703c03 Fix XSS in recent/favorite tables list feature 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-06 18:40:19 +02: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
bd762244ec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:27:02 -04:00
Marc Delisle
4627be8968 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 08:21:06 -04:00
Marc Delisle
93ce1a69de Merge pull request #1195 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-05-26 15:14:04 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check if central columns storage is configured, if not configured don't show the option to sync/remove

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove columns to central list of columns from tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added icon image for central columns add/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

documentation added for central_columns configuration

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

regenerated sprite

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove notices

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprintf for variable message

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix unit test failure errors

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed whitespace issues plus function definition

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-05-26 23:13:03 +05:30
Marc Delisle
0db68db620 Merge branch 'QA_4_2' 2014-05-21 12:51:03 -04:00
Marc Delisle
c2d719b4eb bug #4423 Moving fields not working 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:49:55 -04:00
Ann + J.M
9207203a56 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:51:33 +02:00
Chanaka Indrajith
39b5f07dfb Fixed some documentation issues raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-18 00:14:27 +05:30
Marc Delisle
b35e4efee1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-17 06:10:14 -04:00
Marc Delisle
ebb14cb085 Another case of notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:43:57 -04:00
Marc Delisle
afc755f31c Avoid notice of undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:33:24 -04:00
Marc Delisle
3031996acf Merge commit 'aa2c9cd' 2014-05-15 12:47:50 -04:00
Chirayu Chiripal
aa2c9cd5d6 Bug fix #4414 table display of performance_schema DB structure 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 15:09:26 +05:30
Ashutosh Dhundhara
0a5d1ad757 RFE: #1448 Allow clicking an approximate row count to get a correct one. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-10 20:23:15 +05:30
Marc Delisle
277c0c57db Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:58:37 +02:00
Marc Delisle
d12d752c8c Merge pull request #1171 from ashutoshdhundhara/rfe_1445 
RFE: #1445 Easy access to "SHOW CREATE".
 2014-05-10 12:54:27 +02:00
Madhura Jayaratne
eb96dc7003 This should be an array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:31:51 +02:00
Ashutosh Dhundhara
cc9cef8e15 RFE: #1445 Easy access to "SHOW CREATE". 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-10 02:10:21 +05:30
Michal Čihař
a5f338fe2f Fix handling of favorite tables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:32:49 +02:00
Michal Čihař
4fe6bf0737 Fix return value types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 10:43:34 +02:00
Michal Čihař
a6726ae170 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 19:39:04 +02:00
Michal Čihař
7cccfc1b6d Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 19:38:27 +02:00
Michal Čihař
b4a11fd98e Move acquiring stats to place where the value is used 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 19:36:45 +02:00
Marc Delisle
45d020d1bf Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 12:46:32 -04:00
Marc Delisle
54254f88bd Refactoring: PMA_synchronizeFavoriteTables() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 12:45:51 -04:00
Marc Delisle
c61475ee24 Refactoring: PMA_addRemoveFavoriteTables() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 12:29:04 -04:00
Marvin Wegener
1690c6fa32 Fix number field size and remove incorrect attributes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-02 07:55:50 -04:00
Michal Čihař
94988899c5 Add missing full stop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-22 14:06:44 +02:00
Marc Delisle
9899ac3e93 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:36:19 -04:00
Marc Delisle
f310833cb4 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:26:27 -04:00
Marc Delisle
75b3820eac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:15:40 -04:00
Marc Delisle
db6ec58907 bug #4372 Changing browser transformation results in unnecessary table rebuild 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:07:49 -04:00
Ann + J.M
e7e8b64dd1 HTML5 data attributes for favorite table links 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-17 09:02:28 +02:00
Marc Delisle
a182cca004 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-14 12:26:32 -04:00
Ashutosh Dhundhara
57f8e18e96 Bug Fix: #4362 Adding index to column by button in structure view shows wrong dialog. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 18:34:47 +05:30
Marc Delisle
f46865c660 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 09:34:51 -04:00
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
Marc Delisle
0e13fc74a2 Merge pull request #1115 from ashutoshdhundhara/favorite_table 
Favorite tables feature using Ajax.
 2014-03-28 14:47:55 -04:00
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ř
af3bfe6cfb Consistently use comma at the end of notification messages 
These are sentences and should be ended as such.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-28 09:58:17 +01:00
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only 
Feature request: #1476 Favorite tables select box.
 2014-03-26 17:01:18 -04:00