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

325 Commits

Author SHA1 Message Date
Kasun Chathuranga
b8c764a86e PMA_DBI_get_triggers --> PMA_DBI_getTriggers 2013-05-01 00:09:36 +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
e7e4e67458 PMA_DBI_get_table_indexes_sql --> PMA_DBI_getTableIndexesSql 2013-04-30 23:40:44 +05:30
Kasun Chathuranga
bee0134b1f PMA_DBI_get_tables_full --> PMA_DBI_geTablesFull 2013-04-30 23:27:27 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +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
J.M
f1513b2678 Fix bug #3873 Can't copy table to target database if table exists there 2013-04-14 15:40:29 +02:00
Spun Nakandala
a0dc226332 Contest-3 bug fixed 2013-03-06 14:51:27 +05:30
Marc Delisle
b7feced100 Bug #3597900 Create table page gives errors like unknown table status 2012-12-28 07:55:21 -05:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Marc Delisle
1a0435718c Remove author names in code 2012-10-30 08:21:23 -04:00
Michal Čihař
8db3f106f7 This is actually static method 2012-10-19 11:26:58 +02:00
Chanaka Indrajith
13208324d3 Removed unnecessary empty lines in functions 2012-09-19 00:15:15 +05:30
Chanaka Indrajith
0ff571a128 Modify classes with property 2012-09-16 15:29:56 +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
Marc Delisle
2bb2f2bf54 Undefined variable in this function 2012-09-09 08:07:27 -04:00
Madhura Jayaratne
b02f8ca018 File is being conditionally included; use "include_once" instead 2012-08-11 13:36:10 +05:30
Madhura Jayaratne
2d3ae33c9a Fix indentation 2012-08-11 13:34:35 +05:30
Madhura Jayaratne
099dee48fd Merge branch 'QA_3_5' 2012-08-11 13:33:41 +05:30
Madhura Jayaratne
1228f48c78 bug #3555104 [edit] Cannot copy a DB with table & views 2012-08-11 13:31:04 +05:30
Thilina Buddika
40364f9507 upstream merge 2012-08-04 04:43:54 +05:30
Rouslan Placella
ef65ca306a Neater test for potentially undefined variable and some whitespace cleanup 2012-08-02 21:25:54 +02:00
Marc Delisle
f544ba3f6f Fix undefined index problem 2012-08-02 14:11:22 -04:00
Thilina Buddika
69ba675a89 merge upstream master 2012-07-31 07:08:55 +05:30
Chanaka Indrajith
4465c287c1 Fixed an issue related to multiquery statements and routines modifications 2012-07-26 23:06:29 +05:30
Marc Delisle
03f34c4ef0 Unused method: setCommonFunctions() 2012-07-10 12:36:27 -04:00
Alex Marin
9d21db75dd Add missing include 2012-07-06 01:14:28 +03:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Alex Marin
3fa180b228 oop: merge master, fix commits 2012-06-27 19:52:37 +03:00
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Marc Delisle
f43760aaee Unused code 2012-06-24 06:53:56 -04:00
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
Alex Marin
ff930b788a oop: modify PMA_getTableDef and PMA_getTableDefStandIn usage 2012-06-09 12:38:44 +03:00
Michal Čihař
53cb7b1019 Fix variable names 2012-06-05 09:20:08 +02:00
Michal Čihař
5162efa87c Single place to handle table renaming for configuration storage 2012-06-04 12:02:55 +02:00
Michal Čihař
ccb9228bce Remove unused parameter 2012-06-04 11:52:14 +02:00
Michal Čihař
4059ac7298 Add method for generating update SQLs 2012-06-04 11:49:01 +02:00
Madhura Jayaratne
1e25633195 Documentation comments 2012-05-13 00:28:25 +05:30
Madhura Jayaratne
a3ec2a8b2f Wrap some long lines 2012-05-12 23:53:06 +05:30
Madhura Jayaratne
bda568a501 Remove unused parameters 2012-05-10 22:14:00 +05:30
Madhura Jayaratne
968294b08b Arguments with default values must be at the end of the argument list - more instances 2012-05-10 22:09:13 +05:30
Madhura Jayaratne
fa9f372ebb Arguments with default values must be at the end of the argument list - another instance 2012-05-10 21:51:53 +05:30
Madhura Jayaratne
7cf3bd1554 Multi-line assignments must have the equal sign on the second line 2012-05-10 21:23:09 +05:30
Michal Čihař
9a5d015964 Fix typo 2012-05-02 15:36:54 +02:00
Michal Čihař
cb80085dc9 Make messages translatable 2012-05-02 14:47:15 +02:00
Michal Čihař
254c57320d More readable code 2012-05-02 14:44:09 +02:00
Jo Michael
161a5a9321 Fix new checkstyle warnings 2012-04-29 03:16:11 +02:00
Jo Michael
fd6a96264a Fix some checkstyle FunctionDeclaration NotAtEnd warnings 2012-04-29 02:23:06 +02:00
Jo Michael
6839781e88 Fix checkstyle MultiLineAssignment warnings 2012-04-29 02:16:40 +02:00
Jo Michael
2466594cb7 Fix checkstyle ControlStructures warnings 2012-04-29 02:07:56 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Madhura Jayaratne
da0c3bbd13 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/Table.class.php
 2012-04-25 23:53:12 +05:30
Madhura Jayaratne
d6e05d74b5 Various coding style fixes 2012-04-25 23:12:09 +05:30
Madhura Jayaratne
a817542fda Coding style improvements (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-25 22:27:32 +05:30
Marc Delisle
503e45aba5 Fix merge conflicts 2012-04-25 12:29:55 -04:00
Michal Čihař
c90388c5b3 Wrap some long lines 2012-04-25 13:26:31 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Jo Michael
b5bca9ce0b Move columns in table columns editor 2012-04-09 19:02:13 +02:00
Rouslan Placella
350c86bac7 Merge branch 'QA_3_5' 
Conflicts:
	po/fr.po
	po/pt_BR.po
 2012-04-04 21:16:05 +01:00
Rouslan Placella
bfaef90018 Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	po/fr.po
	po/pt_BR.po
 2012-04-04 21:14:41 +01:00
Chanaka Indrajith Dharmarathna
ac82ba0f45 Fixed bug #3512565 - Missing word Rows in table list tooltip after click 2012-04-04 21:08:35 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
f89b2a3f32 Allow reordering of parameters 2012-03-14 14:47:12 +01:00
Onur Avsar
b916cdb4aa Added feature request 'clearing DEFAULT NULL' (rfe:3484063). 2012-03-05 15:07:09 -05:00
Marc Delisle
d5dede3530 Fix merge conflicts 2011-12-29 09:41:55 -05:00
Glenn
8697ec3d48 patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' 2011-12-29 09:37:43 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Madhura Jayaratne
7ac39c04c2 Merge branch 'QA_3_4' 
Conflicts:
	libraries/Table.class.php
 2011-12-07 08:53:13 +05:30
Madhura Jayaratne
6e0a10494f bug #3452506 [edit] Unable to move tables with triggers 2011-12-07 08:33:28 +05:30
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
Marc Delisle
328defc9d9 bug [view] View renaming did not work 2011-10-10 07:25:52 -04:00
Marc Delisle
6fec80c614 bug [view] View renaming did not work 2011-10-10 07:16:30 -04:00
Aris Feryanto
036d1a8397 Correctly show error message when unable to save UI property 2011-08-29 15:00:06 +08:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
c12073871d Remove deprecated method PMA_Table::_isView() 2011-08-24 21:00:41 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
 2011-08-20 00:48:40 +02:00
Madhura Jayaratne
c28c33c471 Coding style improvements 2011-08-19 23:38:42 +05:30
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
 2011-08-19 15:56:26 +02:00
Michal Čihař
cb9f7a2c26 Clarify code 2011-08-19 11:15:31 +02:00
Michal Čihař
a3f14bbd80 Fix indentation 2011-08-19 11:15:24 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
cc4743d396 'comment' is not a reserved keyword, remove PMA_backquote 2011-08-16 00:05:26 +02:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
7327dab936 Include link to docs 2011-08-15 10:01:10 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Sven Strickroth
fcb4986598 there is no create_time-status for views 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:49 +05:30
Sven Strickroth
ed45a8e1f5 use i10n for error message 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:27 +05:30
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_status.php
 2011-07-20 18:23:21 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-07-14 22:38:20 +02:00
Piotr Przybylski
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
1bf994d73f Try to cast default values for BOOLEAN columns to TRUE/FALSE 
Required for Drizzle, adds more correct values for MySQL
 2011-07-09 22:08:32 +02:00
Piotr Przybylski
024d4adc27 UUID has no length 2011-07-09 21:52:33 +02:00
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Piotr Przybylski
2c4c45a68d SERIAL and BOOLEAN columns have no length 2011-07-09 21:49:07 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Piotr Przybylski
7ef98dc9a2 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-30 00:52:01 +02:00
Aris Feryanto
24150ce3a9 Merge remote-tracking branch 'origin/master' into aris 2011-06-29 10:28:00 +08:00
Piotr Przybylski
eb8caa4b77 Removed dead and incorrect code 
(In static context $this makes no sense)
 2011-06-28 22:42:04 +02:00
Piotr Przybylski
2a8dee495a Fix/unify comments 2011-06-28 22:42:04 +02:00
Piotr Przybylski
02fef2c5af Proper check for TIMESTAMP 2011-06-28 22:42:03 +02:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
28ae930a71 sql_mode doesn't exist in Drizzle 2011-06-26 21:25:24 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Piotr Przybylski
3c55511e5c Use Create_time instead of CREATE_TIME 2011-06-26 18:28:35 +02:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Aris Feryanto
24a257ffce Column reordering: add checking for different server 2011-06-21 12:25:31 +07:00
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
30b85be0a2 Allow for null values in PMA_DBI_get_tables_full 2011-06-17 21:03:02 +02:00
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_processlist.php
 2011-06-15 15:38:04 +02:00
Aris Feryanto
4d27d21e80 No reorder column for table with only 1 column 2011-06-13 13:46:18 +07:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00
Aris Feryanto
803b4639bd Fix bug: Remember sorting and Column reordering not work correctly if table structure changed 2011-06-09 13:04:41 +07:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Piotr Przybylski
7d3cd879a4 Enable exact row counts for views in I_S and D_D. They map to in-memory data, so this shouldn't pose a performance problem 2011-05-18 11:51:08 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Michal Čihař
5c2a111011 Fix format strings. 2010-05-05 11:44:55 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Michal Čihař
968f1f9d2d Merge branch 'QA_3_3' 2010-03-30 13:27:16 +02:00
Michal Čihař
a78fc12048 This method should be public. 2010-03-30 13:27:06 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
87dd6b3cee Merge branch 'QA_3_3' 2010-03-12 17:16:58 -05:00
Dieter Adriaenssens
7c818d046a patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
3e02de8e6e notice: undefined index 2010-02-26 17:49:54 +00:00
Marc Delisle
e5750aa98c bug #2959746 Unknown table status: TABLE_TYPE 2010-02-26 17:43:58 +00:00
Marc Delisle
ac649c64be bug #2959746 Unknown table status: TABLE_TYPE 2010-02-26 17:43:58 +00:00