Commit Graph

6769 Commits

Author SHA1 Message Date
Michal Čihař
c672292268 rfe #1632106 [interface] Improved error handling 2011-11-10 15:44:00 +01:00
Marc Delisle
f42d162b0d 3.4.7.1 release 2011-11-10 09:09:49 -05:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
e51a1cb73d ChangeLog for 3.4.7.1 2011-11-10 08:59:03 -05:00
Aris Feryanto
d61769c133 Added Changelog entry 2011-11-09 00:33:34 +08:00
Aris Feryanto
2dfd1dca14 Added Changelog entry 2011-11-09 00:33:11 +08:00
Rouslan Placella
a00fc340f9 Merge branch 'menubar' 2011-11-05 14:36:08 +00:00
Marc Delisle
a7ea657625 Merge branch 'QA_3_4' 2011-11-05 10:33:45 -04:00
Gabor Gyorvari
8721f7b160 patch #3430291 [import] Handle conflicts in some open_basedir situations 2011-11-05 10:33:19 -04:00
Rouslan Placella
26b869a254 Updated changelog 2011-11-05 14:15:46 +00:00
Marc Delisle
02d5799893 Fix merge conflicts 2011-11-05 10:00:50 -04:00
Robert Scheck
8170d03d3c Patch by Robert Scheck <robert@fedoraproject.org>
for phpMyAdmin >= 3.4.7, which makes the php-gettext
library that is used configurable, which is helpful or even required for
some vendors or downstreams. The default is the internal library to keep
backward compatibility. More details can be found at SourceForge:
https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
2011-11-05 09:57:28 -04:00
Marc Delisle
0b16d690d2 Fix merge conflicts 2011-11-02 12:41:13 -04:00
Marc Delisle
d22fae4201 bug #3428065 [parser] TRUE not recognized by parser 2011-11-02 12:39:43 -04:00
Marc Delisle
6a5af526bb Fix merge conflicts 2011-11-02 07:42:59 -04:00
Marc Delisle
0b24e69435 bug #3426836 [interface] Visual column separation 2011-11-02 07:33:01 -04:00
Marc Delisle
028e9ee6d9 Merge branch 'QA_3_4' 2011-10-31 12:35:12 -04:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04:00
Rouslan Placella
4547ca37f4 Removed an unncessary AJAX request from database search 2011-10-30 16:14:20 +00:00
Rouslan Placella
c52063d283 Merge branch 'QA_3_4'
Conflicts:
	js/db_search.js
2011-10-30 14:32:29 +00:00
Rouslan Placella
f7cb55cb62 Fixed bug #3430377 - Deleted search results remain visible 2011-10-30 14:30:08 +00:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
Marco Gergele
af8a61f73c patch #3428376 [pmadb] pmadb on a different MySQL server 2011-10-29 07:55:39 -04:00
Marc Delisle
240cb2418c 2010 ChangeLog moved to history repo 2011-10-28 09:08:46 -04:00
Rouslan Placella
42720eb9fe Changelog entry for the improved ENUM/SET editor 2011-10-26 18:20:33 +01:00
Marc Delisle
ecb05de4f6 Fix merge conflicts 2011-10-23 10:33:01 -04:00
Marc Delisle
694c1cdf75 bug #3427256 [interface] no links to browse/empty views and tables 2011-10-23 10:27:06 -04:00
Marc Delisle
c067410371 Merge branch 'QA_3_4' 2011-10-23 08:11:23 -04:00
Marc Delisle
d590bccda2 3.4.7 2011-10-23 08:10:47 -04:00
Rouslan Placella
0683bd485b Merge branch 'QA_3_4' 2011-10-21 15:40:58 +01:00
Rouslan Placella
0112ff6ba5 Fixed bug #3426840 - ENUM/SET editor can't handle commas in values 2011-10-21 15:38:59 +01:00
Rouslan Placella
20a57d1fea Merge branch 'QA_3_4'
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
2011-10-21 11:38:38 +01:00
Rouslan Placella
d4cce87b26 Fixed bug #3425230 - enum data split at space char (more space to edit) 2011-10-21 11:34:42 +01:00
Marc Delisle
4cba6ee2dc 3.4.8-dev 2011-10-19 16:58:54 -04:00
Marc Delisle
a3132f6e91 3.4.8-dev 2011-10-19 16:58:10 -04:00
Marc Delisle
c76d9fea3a Merge branch 'QA_3_4' 2011-10-19 13:15:05 -04:00
Marc Delisle
ec99ab3e00 bug #3426031 [export] Export to bzip2 is not working 2011-10-19 13:11:22 -04:00
Michal Čihař
88c5f90e53 Merge branch 'QA_3_4'
Conflicts:
	libraries/core.lib.php
	libraries/sanitizing.lib.php
2011-10-18 12:46:24 +02:00
Michal Čihař
8b9e7c1279 bug #3425184 [doc] Fix links to PHP documentation 2011-10-18 12:44:32 +02:00
Michal Čihař
3535dcfec3 Merge remote-tracking branch 'origin/QA_3_4' 2011-10-18 11:53:40 +02:00
Michal Čihař
3fa0b1f639 [core] Allow to set language in URL 2011-10-18 11:51:24 +02:00
Marc Delisle
ba2159baca Merge branch 'QA_3_4' 2011-10-16 06:22:18 -04:00
Marc Delisle
f3f9122c67 3.4.6 release 2011-10-16 06:21:52 -04:00
Madhura Jayaratne
a478b8164d bug #3299486 [prettyprint] Order By in a query containing comment character 2011-10-15 16:23:31 +05:30
Madhura Jayaratne
acf2a3b472 Merge branch 'QA_3_4'
Conflicts:
	libraries/export/pdf.php
2011-10-14 20:21:09 +05:30
Madhura Jayaratne
77ad710d08 bug #3423725 [pdf] Broken PDF file when exporting database to PDF 2011-10-14 20:17:25 +05:30
Marc Delisle
d297e0b574 Merge branch 'QA_3_4' 2011-10-11 07:45:42 -04:00
Marc Delisle
4a99b6a494 bug #3420229 [doc] Missing documentation section 2011-10-11 07:45:26 -04:00
Marc Delisle
b5e63b56a9 Fix merge conflicts 2011-10-10 08:54:44 -04:00
Marc Delisle
a6fc7ac928 bug [navi] Wrong icon for view (MySQL 5.5) 2011-10-10 08:49:41 -04:00