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

326 Commits

Author SHA1 Message Date
Marc Delisle
b7cec730f3 Improve message and make it translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 07:06:51 -04:00
Marc Delisle
83fb0545a8 bug Incorrect link to documentation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-15 13:08:26 -04:00
Marc Delisle
0aafd71c9f Merge pull request #1324 from ashutoshdhundhara/bug_qbe 
Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage.
 2014-08-11 12:18: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
Ashutosh Dhundhara
9191c1aa4e Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 03:58:19 +05:30
Ashutosh Dhundhara
b3583d4cba RFE#1491: Support InnoDB for database Query by example. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

FAQ entry should remain.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-04 23:55:53 +05:30
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

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

Fix failing test.

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

Fix coding styles.

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

Fix function doc.

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

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Edward Cheng
54000aa117 [Console]Second commit 
Console changes:
+ Ajax global callback
+ Support disable Codemirror
+ Global AJAX callback
+ XSS issues slove
+ JSON response bug fix
+ Selection query Explain and Profiling
+ Translation improvement
+ Bookmark creation and deletion
+ Codemirror wrong font-size under Firefox
+ Options card input elements value bug
+ Etc

Removal:
- Rollback query execution support

Other changes:
+ Unify query history behavior

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-07-29 19:20:38 +08: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
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Hugues Peccatte
929dccb9a3 Cherry-pick dd5ba23: Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-28 19:09:20 +02:00
Hugues Peccatte
920f83da2d Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-26 21:03:17 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 11:39:39 +05:30
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
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +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
7f56c8504d PMA_DBI_fetch_single_row --> PMA_DBI_fetchSingleRow 2013-05-01 00:03:03 +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
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Madhura Jayaratne
ea09916fe5 Wrap more long lines 2013-04-12 22:47:29 +05:30
Marc Delisle
95fa48fc8e Remove remaining code in tbl_alter.php 2012-12-18 15:44:39 -05:00
Marc Delisle
7ea4265554 Improve comments and variable name 2012-11-20 09:32:04 -05:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Marc Delisle
bd125f4bb8 This constant had been replaced by a configuration directive a while ago 2012-10-30 08:20:46 -04:00
Marc Delisle
9b9b5e46f7 Force exact row counting, otherwise the "Browse foreign values" dialog is sometimes not shown 2012-10-30 08:19:32 -04:00
Michal Čihař
067befc59d Avoid trying to store history inside of testsuite 2012-10-18 09:49:20 +02:00
Chanaka Indrajith
13208324d3 Removed unnecessary empty lines in functions 2012-09-19 00:15:15 +05:30
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
18da661f60 Reverting 4465c287c. $analyzed_sql is not defined at this point 2012-07-28 12:05:58 +05:30
Madhura Jayaratne
aaf9f775c4 White space cleanup 2012-07-28 12:04:37 +05:30
Michal Čihař
3a1e5d20d5 Merge remote-tracking branch 'chanaka/master' 2012-07-27 07:59:20 +02:00
Chanaka Indrajith
4465c287c1 Fixed an issue related to multiquery statements and routines modifications 2012-07-26 23:06:29 +05:30
Atul Pratap Singh
6c0e9e5391 Fix typo in 916143e27f 2012-07-22 19:53:51 +05:30
Atul Pratap Singh
916143e27f Fix multiple LEFT JOIN generation problem 2012-07-22 18:32:43 +05:30
Atul Pratap Singh
ec6ac79775 Some more variable name improvements 2012-07-17 06:54:14 +05:30
Atul Pratap Singh
1623e5581d Remove some global variables 2012-07-15 16:12:46 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
ec046f7d11 Use camel case for function names (PMA_query_as_controluser => PMA_queryAsControlUser) 2012-06-23 23:06:29 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Rouslan Placella
c2ae2ae265 Integrated chk_rel.php with PMA_Response class 2012-06-11 14:06:03 +01:00
Michal Čihař
4c099ccc71 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-05 09:19:15 +02:00
Michal Čihař
3a6a938853 Fix variable name 2012-06-05 09:18:59 +02:00
Rouslan Placella
9d38c349bf Fixed regression from commit e544705e3c 2012-06-04 16:03:59 +01:00