Commit Graph

4154 Commits

Author SHA1 Message Date
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
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
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
Crack
e6170b2dc2 comments
output escaping
2010-08-06 15:17:53 +02:00
Crack
bcaec73441 sort messages 2010-08-06 14:56:52 +02:00
Crack
60329f14cb blacklist and settings debug code shown if $cfg['DBG']['php'] is true 2010-08-06 14:36:26 +02: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
Crack
9d4c5409c6 fix import merge
fix <select> handling (hopefully this time for real)
2010-08-05 21:01:59 +02: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
Crack
5dc9f17d39 fix <select> value setting 2010-08-04 16:02:54 +02:00
Crack
a6b34a5977 fix generation of theme unique value
refresh session cache for config after save
2010-08-04 15:27:47 +02:00
Crack
1d265c5893 fix regular expression validation when phpMyAdmin custom error handler is set 2010-08-04 00:57:11 +02:00
Marc Delisle
d46bb6d877 remove custom MIME type change for BLOB streaming because in its current version it can be a very costly operation 2010-08-03 16:21:17 -04:00
Marc Delisle
29cc239057 unused code 2010-08-03 13:14:25 -04:00
Marc Delisle
a8852c5dc9 JSON exported file extension should be .json 2010-08-03 13:10:31 -04:00
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04:00
Crack
4a5ffa7a12 File comments:
- remove @license and @version from comments
- add vim settings
- change descriptions in form definition files
2010-08-03 00:55:57 +02:00
Crack
e3f6715c44 bugfix: use true/false for boolean values read from <select>s instead of 1/0 2010-08-03 00:37:39 +02:00
lorilee
1119d9f723 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-02 14:17:59 -07:00
lorilee
701bc67342 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-02 14:17:22 -07:00
lorilee
75353d1c4a Fixed unwanted spaces in nested lists in IE 2010-08-02 14:14:27 -07:00
lorilee
c41d4be0b1 This code got deleted somehow from a previous commit 2010-08-02 13:48:06 -07:00