Commit Graph

10171 Commits

Author SHA1 Message Date
bhdouglass
16886bc3fb Patch #2974341 In db Structure, clicking on table name should Browse if possible 2010-03-22 17:40:04 -04:00
Marc Delisle
975d4650de Merge branch 'QA_3_3' 2010-03-22 13:25:07 -04:00
Marc Delisle
0f6215f70e testing before merge 2010-03-22 13:24:48 -04:00
Marc Delisle
e859e31149 there was an extra space in the ChangeLog 2010-03-22 13:23:55 -04:00
Marc Delisle
f8fa3b4ede jQuery and slider effect 2010-03-21 07:36:39 -04:00
Marc Delisle
7e77192187 rfe 2958013 After import, also list uploaded filename 2010-03-18 13:02:13 -04:00
Dieter Adriaenssens
3c7538701d Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-03-17 23:05:13 +01:00
Dieter Adriaenssens
c7c77f9744 fix mistake in merge 2010-03-17 22:50:27 +01:00
Marc Delisle
767d16a8fa bug #2972232 Import menu tab not present on main page 2010-03-17 17:50:23 -04:00
Marc Delisle
cdfc277bb7 bug #2972232 Import menu tab not present on main page 2010-03-17 17:48:29 -04:00
Dieter Adriaenssens
27a56224ff Merge branch 'QA_3_3'
Conflicts:
	ChangeLog
	tbl_change.php
2010-03-17 22:14:47 +01:00
Dieter Adriaenssens
142b1e2183 Changed link to git repository on main page 2010-03-17 19:52:11 +01:00
Marc Delisle
8b221f354b typos 2010-03-16 12:49:07 -04:00
Marc Delisle
e2aaeaf1d6 typos 2010-03-16 12:47:42 -04:00
Marc Delisle
8bf35a0e14 typos 2010-03-16 12:42:56 -04:00
Marc Delisle
13cb9e7e3e typos 2010-03-16 12:38:56 -04:00
Marc Delisle
b7bbb967ba no branch exist in the cloned directory; advice for changes before validation 2010-03-16 08:10:49 -04:00
Marc Delisle
e338388cce 3.3.1 release 2010-03-16 07:54:43 -04:00
Marc Delisle
b90805f7eb 3.3.1 release 2010-03-16 07:54:17 -04:00
Marc Delisle
7b831bc877 Merge branch 'MAINT_3_3_1' into QA_3_3 2010-03-15 16:36:48 -04:00
Marc Delisle
e5ab5e637e bug #2970769 Incorrect reference to mootools-more.js 2010-03-15 16:36:19 -04:00
Marc Delisle
87794051a4 bug #2967565 UNHEX not selected by default when inserting BINARY 2010-03-15 16:15:23 -04:00
Marc Delisle
f0672d82c3 bug #2967565 UNHEX not selected by default when inserting BINARY 2010-03-15 16:08:56 -04:00
Marc Delisle
79ce179bae Merge branch 'QA_3_3' 2010-03-14 10:06:24 -04:00
Marc Delisle
7a366c3f08 bug #2967366 Some results of Propose table structure are shown in hex 2010-03-14 10:05:51 -04:00
Marc Delisle
337b2254d8 ChangeLog split 2010-03-14 09:30:46 -04:00
Marc Delisle
a6175337a4 ChangeLog split 2010-03-14 09:29:42 -04:00
Marc Delisle
279d9c23d4 rename this variable to avoid confusion with SQL primary keys, for example 2010-03-14 09:13:44 -04:00
Marc Delisle
a3bbb9aada Merge branch 'QA_3_3' 2010-03-14 08:48:11 -04:00
Marc Delisle
b686640a06 bug #2966078 Incorrect LIMIT is saved and sticks while browsing 2010-03-14 08:46:01 -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
Michal Čihař
c4bdb18703 Better logging of progress. 2010-03-12 13:49:27 +01:00
Michal Čihař
105c33fe34 Automatically create TESTING/STABLE tags on release. 2010-03-12 13:48:03 +01:00
Marc Delisle
bbc3d3debf Merge branch 'QA_3_3' 2010-03-11 17:59:19 -05:00
Marc Delisle
4a53eb1916 duplicate comment 2010-03-11 17:58:51 -05:00
Michal Čihař
3e5c8f9f01 Add list of ignored files. 2010-03-11 15:15:10 -05:00
Michal Čihař
0db3d899ee Add list of ignored files. 2010-03-11 15:14:02 -05:00
Marc Delisle
4876d27758 remove mention of subversion 2010-03-11 12:41:04 -05:00
Marc Delisle
a69a952811 Uzbek update 2010-03-11 12:27:24 -05:00
Michal Čihař
84934d8746 Add list of ignored files. 2010-03-11 17:06:10 +01:00
Michal Čihař
56404c562b Upload also release notes. 2010-03-11 16:58:28 +01:00
Michal Čihař
8fb7ecae3f Link to wiki. 2010-03-11 16:57:54 +01:00
Michal Čihař
6d5a1c3c29 Add script for automatically uploading a release. 2010-03-11 16:50:15 +01:00
Michal Čihař
93b19bded8 Proper path to release notes. 2010-03-11 16:49:58 +01:00
Michal Čihař
17147737eb Add support for tagging a release. 2010-03-11 16:40:06 +01:00
Michal Čihař
39c0280bf3 Update script for creating releases to work with Git. 2010-03-11 16:32:37 +01:00
Michal Čihař
f61b39fd2f Remove snapshot mode.
It is not used anyway and just complicates the script.
2010-03-11 16:15:50 +01:00
Michal Čihař
aebacd260f Merge branch 'QA_3_3'
Conflicts:
	ChangeLog
	Documentation.html
	README
	documentation-gsoc/Synchronization_User_Manual.htm
	lang/afrikaans-utf-8.inc.php
	lang/albanian-utf-8.inc.php
	lang/arabic-utf-8.inc.php
	lang/azerbaijani-utf-8.inc.php
	lang/bangla-utf-8.inc.php
	lang/basque-utf-8.inc.php
	lang/belarusian_cyrillic-utf-8.inc.php
	lang/belarusian_latin-utf-8.inc.php
	lang/bosnian-utf-8.inc.php
	lang/brazilian_portuguese-utf-8.inc.php
	lang/bulgarian-utf-8.inc.php
	lang/catalan-utf-8.inc.php
	lang/chinese_simplified-utf-8.inc.php
	lang/chinese_traditional-utf-8.inc.php
	lang/croatian-utf-8.inc.php
	lang/czech-utf-8.inc.php
	lang/danish-utf-8.inc.php
	lang/dutch-utf-8.inc.php
	lang/estonian-utf-8.inc.php
	lang/finnish-utf-8.inc.php
	lang/galician-utf-8.inc.php
	lang/georgian-utf-8.inc.php
	lang/german-utf-8.inc.php
	lang/greek-utf-8.inc.php
	lang/hebrew-utf-8.inc.php
	lang/hindi-utf-8.inc.php
	lang/hungarian-utf-8.inc.php
	lang/indonesian-utf-8.inc.php
	lang/italian-utf-8.inc.php
	lang/japanese-utf-8.inc.php
	lang/korean-utf-8.inc.php
	lang/latvian-utf-8.inc.php
	lang/lithuanian-utf-8.inc.php
	lang/macedonian_cyrillic-utf-8.inc.php
	lang/malay-utf-8.inc.php
	lang/mongolian-utf-8.inc.php
	lang/norwegian-utf-8.inc.php
	lang/persian-utf-8.inc.php
	lang/polish-utf-8.inc.php
	lang/portuguese-utf-8.inc.php
	lang/romanian-utf-8.inc.php
	lang/russian-utf-8.inc.php
	lang/serbian_cyrillic-utf-8.inc.php
	lang/serbian_latin-utf-8.inc.php
	lang/sinhala-utf-8.inc.php
	lang/slovak-utf-8.inc.php
	lang/slovenian-utf-8.inc.php
	lang/spanish-utf-8.inc.php
	lang/swedish-utf-8.inc.php
	lang/tatarish-utf-8.inc.php
	lang/thai-utf-8.inc.php
	lang/turkish-utf-8.inc.php
	lang/ukrainian-utf-8.inc.php
	lang/uzbek_cyrillic-utf-8.inc.php
	lang/uzbek_latin-utf-8.inc.php
	libraries/Config.class.php
	libraries/Table.class.php
	libraries/display_tbl.lib.php
	server_privileges.php
	server_replication.php
	server_synchronize.php
	translators.html
2010-03-11 14:06:06 +01:00
Michal Čihař
4ac7e46605 Forgotten conflict resolving after merge. 2010-03-11 14:00:01 +01:00