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

123 Commits

Author SHA1 Message Date
Michal Čihař
cdffe9fb97 Merge remote-tracking branch 'origin/QA_3_4' 
Conflicts:
	libraries/dbi/mysql.dbi.lib.php
 2011-12-14 10:06:36 +01:00
Michal Čihař
da62d86238 These are done and we do not seem to use decimals 2011-12-14 10:00:01 +01:00
Michal Čihař
91241f71d3 Fill orgtable and orgname attributes 2011-12-14 09:58:47 +01:00
Michal Čihař
cec8f1b094 Add actually some sane value to field flags 2011-12-14 09:56:02 +01:00
Michal Čihař
a074b4c6e2 Create fake flags field 
The content is empty for now, but at least the code will not emit
warnings on every access to it (which is quite often). The proper value
calculation should be added later.
 2011-12-14 09:49:51 +01:00
Michal Čihař
ea64f8f731 Whitespace cleanup 2011-12-14 09:49:35 +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
Michal Čihař
6d1bd82939 Factor out error message formatting 2011-10-24 17:42:07 +02:00
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
c326cfeec4 Comments 2011-07-28 13:32:38 +02:00
Piotr Przybylski
5f8842739d Remove invalid usage of $php_errormsg 2011-07-27 21:26:28 +02:00
Piotr Przybylski
e82682d0e4 Simplify PMA_DBI_free_result 
It was never used with multiple arguments
 2011-07-27 19:59:49 +02:00
Piotr Przybylski
f43517efb5 mysql extension - remove 'persistent' parameter 
Was named 'persistant' and never used/documented
 2011-07-27 19:59:49 +02:00
Piotr Przybylski
46cd0f9a09 Comments 2011-07-27 19:59:49 +02:00
Piotr Przybylski
69ac509584 This should be checked in common, not in dbi library 2011-07-27 19:59:48 +02:00
Piotr Przybylski
2141b5fe81 Fix incorrect variable name 
persistant > persistent
 2011-07-27 19:59:48 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Rouslan Placella
48532dfad0 Fixed "Commands out of sync" error when executing stored Routines. 2011-06-06 17:18:24 +01:00
Michal Čihař
4603ca7001 Factor out common code for PMA_DBI_try_query. 
PMA_DBI_try_query is now shared for mysql and mysqli as the only
difference there was real call to the database, the rest was same
(timing, tracking, debugging,..).
 2011-06-06 14:03:13 +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
651b357f8a Whitespace cleanup 2011-02-15 17:38:08 +01:00
Marc Delisle
89552c74c4 Merge branch 'QA_3_3' 2011-01-12 08:05:40 -05:00
Marc Delisle
31cd4bdd6a bug #3155842 [core] Edit relational page and page number 2011-01-12 08:04:57 -05:00
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
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
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:10:04 +02:00
Michal Čihař
a24e418527 Avoid PHP error when false is passed to PMA_DBI_getError. 
This can be caused by controllink set to false.
 2010-08-23 17:02:15 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
59b3b4916b Escape error message coming from MySQL to avoid XSS on bad parameters. 2010-08-20 11:35:42 +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
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ř
ea56f74a45 Fix ' escaping. 2010-05-05 11:19:51 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04: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
4fda8872e6 avoid going back to login page on slave configuration 2009-12-24 12:18:31 +00:00
Marc Delisle
9ae329e4ad in Synchronize, the connection problems detection no longer worked 2009-10-16 00:32:42 +00:00
Herman van Rink
3a0663061d Replication code cleanup, some untranslated strings, indentation, new TODO's and extra comments. 2009-09-09 13:40:16 +00:00
Michal Čihař
158380c18a Coding style. 2009-08-25 13:42:21 +00:00
Tomas Srnka
e325226e57 *Fixed bug with different port than 3306 
*Fixed support for other server than localhost
*Added support for sockets
*Fixed GUI bugs - strings (localization), table, fieldset...
*new PNG transparent icon.16x16
 2009-08-24 18:10:45 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Michal Čihař
49036e6003 rfe #1694104 Allow logging of user status with Apache. 2009-03-03 16:20:41 +00:00
Michal Čihař
ec305517f1 rfe #1913541 link to InnoDB status when error 1005 occurs 2008-11-30 14:14:28 +00:00