Commit Graph

261 Commits

Author SHA1 Message Date
Marc Delisle
673fce8145 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-03 12:33:25 -04: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
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
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-26 10:39:50 +02:00
Marc Delisle
eebac0cd0f Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-21 12:21:23 -04:00
Marc Delisle
f027527c51 Merge branch 'QA_4_2' 2014-05-20 08:22:00 -04:00
Marc Delisle
fda047361d Fix notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-20 08:21:27 -04:00
Ann + J.M
d9bd81a2a1 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:40:24 +02:00
Chirayu Chiripal
fed689c7e1 documentation & coding style issues fix
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-18 12:38:49 +05:30
Michal Čihař
d0aeb9e342 Use fetchValue directly as we do not need the query anyway
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-13 15:27:26 +02:00
Marc Delisle
517b55f5ed Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-01 17:28:30 -04:00
Ashutosh Dhundhara
4346955b45 Feature Request: #1329 Can't rename column with foreign key constraint.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed tests.

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

Fixed coding style conventions.

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

Again fixed some coding conventions.

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

Ripped trailing white spaces in relation.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-03-27 14:36:23 +05:30
Hugues Peccatte
02afab96fb Add config help for saved QBE searches.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-26 20:50:03 +01:00
Hugues Peccatte
8b84cf0d91 Feature #569 Load/Save Query By Example
Implement possibility to save/load/delete a QBE on a DB.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-23 14:52:48 +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
Marc Delisle
b4285eb7ca Merge branch 'QA_4_1' 2013-12-21 11:57:45 -05:00
Marc Delisle
5360a84a55 bug #2961 Relations settings not updated on config change
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-21 11:56:33 -05:00
Marc Delisle
9a5c81b5ca Merge branch 'QA_4_1' 2013-12-21 10:25:03 -05:00
Marc Delisle
0d7eeadba7 Revert "bug #2961 Relations settings not updated on config change"
This reverts commit 1cc3e27308.
2013-12-21 10:23:54 -05:00
Marc Delisle
fa73a324ee Merge branch 'QA_4_1' 2013-12-21 10:10:49 -05:00
Marc Delisle
1cc3e27308 bug #2961 Relations settings not updated on config change
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-21 10:09:55 -05:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 22:13:10 +01:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Michal Čihař
d3432b7f73 End sentence with stop 2013-08-23 09:30:36 +02:00
Michal Čihař
6df3c0adb5 Merge pull request #543 from madhuracj/pma_string
Pma string
2013-07-27 12:50:24 -07:00
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
Conflicts:
	ChangeLog
2013-07-27 14:01:35 -04:00
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Marc Delisle
4e40875d02 Merge branch 'QA_4_0' 2013-07-26 09:06:15 -04:00
Marc Delisle
4a6b6bda90 bug #3998 Non-permanent SQL history not working 2013-07-26 08:59:04 -04:00
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
2013-07-25 07:08:04 +05:30
Kasun Chathuranga
dd39bdd717 Use 'show' instead of 'unhide' in messages and method comments 2013-07-25 06:52:29 +05:30
Kasun Chathuranga
72c775556a Fix typo 2013-07-23 09:29:33 +05:30
Kasun Chathuranga
342e0a6b33 Configuration values for hide/unhide navigation items feature 2013-07-20 17:10:43 +05:30
Marc Delisle
b1b39e8b0f Fix typos 2013-07-18 13:19:55 -04:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Kasun Chathuranga
a74c9a065b Fix alignment 2013-07-05 12:08:26 +05:30
Kasun Chathuranga
1a86073cb2 Warn about missing tables for configurable menus feature 2013-07-05 12:05:46 +05:30
ayushchd
2e542c4f95 Group native and mb string functions into classes 2013-06-20 12:30:04 +05:45
Michal Čihař
67543568b1 Merge commit 'f414eb577b13f908f4bea09d69ddc944b7f4629c'
Conflicts:
	libraries/schema/Visio_Relation_Schema.class.php
2013-06-11 13:33:25 +02:00
Michal Čihař
68dfc347f9 Fixed formatting of documentation URL (can contain %, so it can not be used as format string) 2013-06-11 13:23:43 +02:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Michal Čihař
bace090a12 Fix syntax error 2013-05-10 11:16:44 +02:00
Michal Čihař
0b55726fa1 Wrap some long lines 2013-05-10 11:12:25 +02:00
Michal Čihař
cf4ee2f546 Better function names 2013-05-10 11:06:18 +02:00
Kasun Chathuranga
c09aa36d84 PMA_DBI_insert_id --> PMA_DBI_insertId 2013-05-04 08:41:02 +05:30
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30