nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,216 Commits 1 Branch 0 Tags
0431042bd05a6c580951f7f7497fc237b17919d1
Commit Graph

6338 Commits

Author SHA1 Message Date
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Herman van Rink
223d8850cf patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 2010-09-02 14:35:30 +02:00
Herman van Rink
7aa4aa62dc bug #3056610 [interface] Removed modification options for information_schema 2010-09-02 11:53:53 +02:00
Michal Čihař
b58db4c2e7 Merge branch 'QA_3_3' 2010-08-30 17:30:47 +02:00
Michal Čihař
73ce5705bd [setup] Fixed escaping of server name. 2010-08-30 17:30:37 +02:00
Michal Čihař
0bf02f05f1 Merge branch 'QA_3_3' 
Conflicts:
	libraries/sqlparser.data.php
	pdf_pages.php
 2010-08-30 17:24:55 +02:00
Michal Čihař
061b87f11f bug #3035300 [parser] Fixed wrong definition of keywords. 2010-08-30 17:23:50 +02:00
Michal Čihař
4f487780a0 bug #3042665 [parser] Add workaround for MySQL way of handling backtick. 2010-08-30 17:19:11 +02:00
Michal Čihař
fdb0d32df4 Merge branch 'QA_3_3' 2010-08-30 14:18:02 +02:00
Michal Čihař
4a234050f2 bug #3054458 [core] Fixed displaying number of rows. 2010-08-30 14:17:51 +02:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02: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
Marc Delisle
949f068733 3.3.6 release 2010-08-28 10:46:02 -04:00
Marc Delisle
23da6a6e1a 3.3.6 release 2010-08-28 10:44:56 -04:00
Marc Delisle
56381c086f adapted patch #3050492 to new code 2010-08-28 08:57:27 -04:00
Martin Schönberger
fee00e61aa Patch #3050492, Cannot drag table box to the edge 2010-08-28 08:16:05 -04:00
Marc Delisle
9a9399e07a Credits for Ninad Pundalik 2010-08-27 17:50:20 -04: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
Herman van Rink
0ea410c3e4 updated changelog 2010-08-26 10:01:08 +02:00
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ř
03d3062a65 Credits and changelog for Lori. 2010-08-23 11:17:15 +02:00
Michal Čihař
4a75c9b26e Changelog and credits for schema export. 2010-08-23 11:14:30 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
67b3567543 Users preferences log entry 2010-08-21 08:13:44 -04:00
Marc Delisle
9036ac09e3 3.3.7-dev 2010-08-20 13:03:13 -04:00
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ř
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 
Conflicts:
	ChangeLog
	libraries/common.lib.php
 2010-08-20 13:36:49 +02:00
Michal Čihař
d128f80605 Changelog. 2010-08-20 13:33:32 +02:00
Michal Čihař
5128563d07 Merge branch 'QA_3_3' 
Conflicts:
	libraries/common.lib.php
	libraries/core.lib.php
 2010-08-20 11:11:27 +02:00
Michal Čihař
893abac3e5 bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. 
It might be needed from common.inc.php even if PMA_MINIMUM_COMMON is
defined.
 2010-08-20 11:09:15 +02:00
Michal Čihař
5f837f08c9 Merge branch 'QA_3_3' 2010-08-20 11:02:50 +02:00
Michal Čihař
a29323a1a6 bug #3044189 [doc] Cleared documentation for hide_db. 2010-08-20 11:02:38 +02:00
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
Marc Delisle
dda6de20d2 bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-10 17:55:04 -04:00
ninadsp
95a8521f11 Merge remote branch 'origin/master' 2010-08-10 00:55:22 +05:30
Marc Delisle
ba038ed6e1 fix merge conflict 2010-08-07 07:10:18 -04:00
Marc Delisle
789d3a4131 Withdraw or edit FAQ entries related to older MySQL or PHP 2010-08-07 07:08:11 -04:00
Marc Delisle
75d5afd401 merge conflict 2010-08-07 06:30:13 -04:00
Marc Delisle
04c2f9d254 bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default 2010-08-07 06:27:04 -04:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
fd65dcdcd1 Merge branch 'QA_3_3' 2010-08-05 13:00:24 -04:00
Marc Delisle
d42dab9dd4 patch #3039269 [dbi] Wrong variable checked for nopassword option 2010-08-05 12:22:56 -04:00
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04:00
Isaac Bennetch
6383f23035 patch #3038293 [doc] Language and grammar fixes 2010-08-03 12:39:02 -04:00
Marc Delisle
887e2be664 fix merge conflicts 2010-08-01 06:20:10 -04:00
Marc Delisle
fd1d214d35 bug #3036132 [core] Triggers not fetched if dbname has an hyphen 2010-08-01 06:17:03 -04:00
Marc Delisle
f9f987f544 Merge branch 'QA_3_3' 2010-07-31 14:54:34 -04:00
Marc Delisle
7951b2bacc bug #3034026 [confirmation] TRUNCATE queries get no confirmation request 2010-07-31 14:54:05 -04:00