nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,025 Commits 1 Branch 0 Tags
d025833063e4920b51e6597e5ca1a61e60ec649c
Commit Graph

4459 Commits

Author SHA1 Message Date
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02: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
ninadsp
e1f319eef1 Trailing } left while resolving merge conflict. Removed it 2010-08-19 00:45:50 +05:30
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
Michal Čihař
48e9096600 Properly check validity of sort parameter. 2010-08-18 12:31:54 +02:00
Michal Čihař
25ac7de38c Document PMA_sanitize. 2010-08-18 11:42:08 +02:00
Michal Čihař
00add5c43f Add option to escape PMA_sanitize output. 
This is required when it is used in form values.
 2010-08-18 11:38:19 +02:00
Michal Čihař
533e102135 Fix handling of unknown sort order. 2010-08-18 11:30:19 +02: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
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
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
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03: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
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
lorilee
955df80a30 Set properties to be text and icons by default 2010-08-14 11:47:44 -07:00
Martynas Mickevicius
0b90202b8f fixed an issue when a serie name was not set, thus generating a warning 2010-08-13 14:50:21 +03:00
Martynas Mickevicius
eb3f96ac51 changed comments to comply with phpdoc and added some new comments. Moved color settings to more appropriate places. 2010-08-13 14:34:07 +03:00
Martynas Mickevicius
d6185d7ace removed leftovers from never-used flash chart implmenetation 2010-08-13 12:17:26 +03: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