nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,998 Commits 1 Branch 0 Tags
ddfb1a3905f9dba3cb7bcf18c6c694968e65f37d
Commit Graph

4414 Commits

Author SHA1 Message Date
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
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
lorilee
765bfb6f40 Should be closing a group, not a subgroup 2010-08-02 13:14:41 -07:00
Adnan
bdf033115b Merge remote branch 'origin/master' into export_branch 2010-08-02 10:46:50 +05:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
Crack
279724d6f8 bugfix: user preferences don't work correctly without output buffering 2010-08-01 22:52:15 +02:00
Crack
9a73307003 allow users to set only_db and hide_db 2010-08-01 21:55:04 +02:00
Crack
30413def3e bugfix: removed superfluous ob_end_clean() which caused page rendering to fail when OBGzip was enabled 2010-08-01 21:46:33 +02:00
Marc Delisle
887e2be664 fix merge conflicts 2010-08-01 06:20:10 -04:00
Marc Delisle
fd1d214d35 bug #3036132 [core] Triggers not fetched if dbname has an hyphen 2010-08-01 06:17:03 -04:00
Marc Delisle
00b600a642 localize more blob streaming messages 2010-07-31 14:13:16 -04:00
ninadsp
e6f083c703 Ajaxified Create Database action. Have to append newly created db to table yet though 2010-07-31 02:25:29 +05:30