Commit Graph

121 Commits

Author SHA1 Message Date
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
Sebastian Mendel
e8a6b1af54 new function to rename a field in relation tables (from tbl_alter.php) 2008-05-06 14:04:54 +00:00
Marc Delisle
7c5d5c466a PBXT: foreign key support 2008-05-04 18:36:17 +00:00
Sebastian Mendel
b7733ad022 get all db comments at once, not with single queries 2008-01-21 13:52:26 +00:00
Sebastian Mendel
9b7f22ae50 cleanup
moved relation function into relation library file
(some of the changes where checked in with previous checkin by accident)
2007-10-16 15:00:51 +00:00
Sebastian Mendel
d9eebc2ae0 removed closing of db connection, closing database connection is only required if script runs longer than database connection is needed 2007-10-16 14:02:16 +00:00