Commit Graph

4030 Commits

Author SHA1 Message Date
Adnan
13abea596a Merge remote branch 'origin/master' into export_branch 2010-08-20 11:34:36 +05:00
Adnan
5fb5678a50 DIA Relation Schema: scale diagram fix 2010-08-20 11:11:51 +05:00
Adnan
75623e5066 EPS Relation Schema: missing lines fix 2010-08-20 11:09:37 +05:00
Adnan
afcf1e6bbe Automatic Foreign/Internal Layout fix 2010-08-19 17:31:01 +05:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +02:00
Michal Čihař
d76fe3856b Remove some HTML from translatable strings. 2010-08-19 11:35:45 +02:00
Michal Čihař
660324620c No HTML for translators. 2010-08-19 11:32:26 +02:00
Michal Čihař
3f33397651 No need to translate SQL statements. 2010-08-19 11:31:28 +02:00
Michal Čihař
882892af23 Better translatable messages. 2010-08-19 11:30:44 +02:00
Michal Čihař
763aff5a6f Use format strings. 2010-08-19 11:30:32 +02:00
Michal Čihař
124ba18d03 Better to use format strings. 2010-08-19 11:26:34 +02:00
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Michal Čihař
26c79f55c5 Backward compatibility for language cookies. 2010-08-19 10:52:58 +02:00
Adnan
d579653dc5 Removed debug commented code 2010-08-18 19:31:29 +05:00
Adnan
4a4ddeadcf Fixed mime types and improve comments 2010-08-18 18:05:01 +05:00
Adnan
381ba1be0f Merge remote branch 'origin/master' into export_branch 2010-08-18 17:03:35 +05:00
Michal Čihař
1f248cc254 Simplify code to use native tcpdf functions. 2010-08-18 13:58:52 +02:00
Adnan
d6c630c64e Proper Error handling of Schema 2010-08-18 15:58:24 +05:00
Adnan
03b1bbf9b3 User Interface change in Schema Generation Options Box 2010-08-18 12:22:56 +05:00
Adnan
b95a14c0de TCPDF: merge conflict fixed 2010-08-17 22:26:15 +05:00
Adnan
224abbaf5e TCPDF: reverted back from 14b26e3 2010-08-17 21:02:54 +05:00
Adnan
1cdf881f42 handling headers issue in schema export 2010-08-17 20:41:15 +05:00
Michal Čihař
0f39dc040a Merge branch 'QA_3_3' 2010-08-17 15:31:06 +02:00
Michal Čihař
e8cf1ac677 Generate new token on forcible generating of session id. 2010-08-17 15:30:47 +02:00
Adnan
03d37b45f1 Removing previous schema generation code which was duplicating 2010-08-17 15:23:06 +05:00
Adnan
2a5a6e39b1 EPS Relation Schema Class: adding boundingbox and pages commands 2010-08-16 17:53:30 +05:00
Adnan
821b8b134e Merge remote branch 'origin/master' into export_branch 2010-08-16 04:52:53 +05:00
Adnan
6f750d7379 Visio Relation Schema Class 2010-08-16 04:49:45 +05:00
Adnan
2c42e1bccb EPS Relation Schema Class 2010-08-15 15:06:26 +05:00
lorilee
8fa03264e4 Added comments 2010-08-14 15:14:45 -07:00
lorilee
e7ac520670 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-14 14:40:42 -07:00
lorilee
ed918c070b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-14 14:39:59 -07:00
lorilee
03fdce14c4 Checks if value is a string before calling urldecode() 2010-08-14 14:10:18 -07:00
lorilee
955df80a30 Set properties to be text and icons by default 2010-08-14 11:47:44 -07:00
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
lorilee
5dafeb467f Added Quick export options 2010-08-10 22:12:46 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
lorilee
90c0e573f7 Fixed formatting 2010-08-10 20:43:57 -07:00
Marc Delisle
dda6de20d2 bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-10 17:55:04 -04:00
lorilee
1c0b81d477 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-09 13:36:31 -07:00
lorilee
6f833918e9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-09 13:35:27 -07: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
lorilee
8b199f7e3a Replacing old tooltip with new jQuery plugin 2010-08-05 18:23:52 -07:00
lorilee
841fba88d5 Removing alt text since it interferes with tooltip 2010-08-05 18:23:18 -07:00
lorilee
646627b911 Updated tooltips using the new tooltip plugin; the code in js/functions.js was moved from js/tooltip.js (with new code appended); <sup> IDs not needed 2010-08-05 18:05:25 -07:00
lorilee
422e509078 Replacing old tooltip with new jQuery plugin 2010-08-05 17:31:02 -07:00
Marc Delisle
fd65dcdcd1 Merge branch 'QA_3_3' 2010-08-05 13:00:24 -04:00
Will Palmer
158517d764 bug [mysqli] non-global $cfg referenced where $GLOBAL['cfg'] expected 2010-08-05 12:19:14 -04:00