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
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
Michal Čihař
1a171a9e2f Fix function name 2012-06-04 13:31:08 +02:00
Michal Čihař
a9d7091b84 Wrap some long lines 2012-06-04 13:24:01 +02:00
Michal Čihař
e544705e3c Wrap some long lines 2012-06-04 12:12:49 +02:00
Michal Čihař
6313931432 Add missing comment 2012-06-04 12:08:58 +02:00
Michal Čihař
705c01b5c9 Better name for function 2012-06-04 12:08:14 +02:00
Michal Čihař
fae33dee87 Add documentation 2012-06-04 12:07:21 +02:00
Michal Čihař
9e4a145297 Correct wrapping 2012-06-04 12:07:04 +02:00
Michal Čihař
9e09c575d7 Missing doc 2012-06-04 12:06:37 +02:00
Michal Čihař
7faef41a23 This code is broken anyway (see comment above) 2012-06-04 12:03:46 +02:00
Michal Čihař
5162efa87c Single place to handle table renaming for configuration storage 2012-06-04 12:02:55 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
fbfe2dc3d4 Another syntax error I introduced 2012-04-27 09:53:38 +02:00
Michal Čihař
dbf1f40808 Another missing comma 2012-04-27 09:52:39 +02:00
Michal Čihař
6ad180e22e Oops, missing comas 2012-04-27 09:31:42 +02:00
Michal Čihař
16d040b4a5 Wrap some function calls 2012-04-27 09:15:31 +02:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Madhura Jayaratne
b531455738 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/mult_submits.inc.php
 2012-03-21 05:59:46 +05:30
Madhura Jayaratne
ac83360796 Coding style improvements 2012-03-21 05:45:58 +05:30
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master 
Various
 2012-03-18 12:09:23 -07:00
Jo Michael
c36a9113e0 Replaced td[align] with td[class] due to HTML5 2012-03-18 19:53:43 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
3bf006c5eb Better context 2012-03-09 16:09:02 +01:00
Michal Čihař
fde7faa749 Chinese needs different word here than in other places 2012-03-09 16:03:10 +01:00
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +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
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
21e2913add Remove not needed param from PMA_REL_create_page 2011-08-15 11:37:23 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
ca8a30f7f8 Fix usage of PMA_DBI_get_columns 2011-08-05 01:24:02 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Madhura Jayaratne
c1f586b9fd Bug #3383904 - Column comments are not displayed 2011-08-03 20:48:28 +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
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
b40fdde6e8 Revert "Avoid double underscore in function name" 
This reverts commit c29c0e0eb5.

Oops, this is actually needed.
 2011-07-21 11:08:44 +02:00
Michal Čihař
c29c0e0eb5 Avoid double underscore in function name 2011-07-21 11:04:37 +02: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
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02: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
86d5ae2697 Emulate relations for some data_dictionary tables 2011-05-24 19:35:57 +02:00
Marc Delisle
8f2a040f41 Merge commit 'ab6d16ed2f4728c9f066353a851621a352ef969f' 2011-05-24 08:18:25 -04:00
Aris Feryanto
8f99ac7a28 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-24 08:42:32 +07:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Aris Feryanto
4ab5d6aded Update documentation and string for the pma_recent 2011-05-10 20:42:48 +07:00
Aris Feryanto
23021911b1 Recently used tables (class, configuration, remember in pma database) 2011-05-08 02:42:38 +07:00
Madhura Jayaratne
da82fe392b Bug #3183970 Losing SQL history 2011-02-18 18:54:36 +05:30
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Marc Delisle
ab393d3f82 Bug #3141327 (Foreign key input options) 2010-12-27 08:29:31 -05: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
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
Crack
d68f2db904 add warnings if pma_userconfig is not present 2010-06-18 20:22:34 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Michal Čihař
f8d0e57a3d Can not use text as index here. 
We already get translated string.
 2010-05-25 16:56:29 +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
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04: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
Herman van Rink
85d3b6258e rfe #2792992 [doc] Added advice to re-login after changing pmadb settings 2010-02-15 15:21:55 +00:00
Michal Čihař
eef869d8dd rfe #2937850 [doc] Add some hints to chk_rel.php for quick setup. 2010-01-25 12:43:35 +00:00
Marc Delisle
eacec1d091 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
ba66e07181 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
71e6f68763 bug [history] QueryHistoryDB is not respected 2009-11-28 13:11:13 +00:00
Marc Delisle
40b28baf4d patch #2903400 [bookmarks] Status of bookmark table 2009-11-25 10:52:32 +00:00
Marc Delisle
1419fcf3c2 remove deprecated parameter of PMA_Table::countRecords() 2009-10-23 10:02:09 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
e5892a65fc Incorrect report of missing relational features 2009-06-24 21:18:00 +00:00
Marc Delisle
e67f4cbc54 clarify function name 2009-06-24 11:34:56 +00:00
Marc Delisle
cef9b6889c patch #2538358 part 2 2009-02-10 19:21:01 +00:00
Marc Delisle
3942544d52 patch #2538358 [display] Conditions for relational display field 2009-01-27 18:26:30 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
e946798332 bug #2163437 [core] Cannot disable PMA tables 2008-10-19 00:42:04 +00:00
Marc Delisle
fe78d240bb b to strong, and remove bold for MySQL charset 2008-07-09 15:24:44 +00:00
Marc Delisle
374963344a Do not save too big queries in history 2008-07-09 14:17:19 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
8f4f6d8878 rfe #1962383 [designer] Option to create a PDF page 2008-06-30 19:07:09 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
07bea9b00d improved doc for function 2008-05-11 12:45:46 +00:00
Sebastian Mendel
c69ae450aa cache relation information (saves at least two queries per HTTP request) 2008-05-08 05:06:50 +00:00