nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,487 Commits 1 Branch 0 Tags
f83f808c99ac9cda99a0777be5133dde2f5a92b8
Commit Graph

4430 Commits

Author SHA1 Message Date
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
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
ninadsp
95a8521f11 Merge remote branch 'origin/master' 2010-08-10 00:55:22 +05:30
ninadsp
2ba0095ab5 We can now edit NULL fields and set fields to NULL in inline editing. 2010-08-09 00:49:11 +05:30
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
Martynas Mickevicius
59f220eb13 added check for json encoder, cleaned up error handling a bit 2010-08-06 13:22:04 +03: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
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
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
Martynas Mickevicius
47f67613a2 fixed a notice which was generated on non supported query result format 2010-08-05 16:47:28 +03: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
ninadsp
c897adc3a4 Ajaxified Change Password action on main page 2010-08-03 19:10:37 +05:30
ninadsp
94b7567ec8 Merge remote branch 'origin/master' 2010-08-03 18:25:19 +05:30