Commit Graph

4233 Commits

Author SHA1 Message Date
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
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
Crack
23d74c9996 fix config download from index.php in setup script 2010-07-30 20:31:47 +02:00
Crack
dcc352a9dc refactor config file generation out of ConfigFile class 2010-07-30 20:25:22 +02:00
Crack
7f75e7515f improve formatting in generated config file 2010-07-30 19:45:53 +02:00
Crack
157c4fb775 fixed some fields not saving due to equality conversions (eg. 0 == 'auto')
fix user preferences menu display when tabs don't fit on screen
2010-07-30 19:44:59 +02:00
Crack
9adc2597c5 short comments for inputs:
- information whether SQL validator is enabled for Validate link
- information about required extensions (SOAP, compression)
- information for constrained values (eg. MaxDbList)
2010-07-30 00:47:20 +02:00
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-29 14:12:36 -07:00
Martynas Mickevicius
68f4a8daf7 removed OFC implementation, since we are not going to use it. 2010-07-29 20:26:16 +03:00
Martynas Mickevicius
55089f12db getting title shadow back. Will see how it looks on the demo server. 2010-07-29 20:22:55 +03:00
Martynas Mickevicius
fe77ca741c fixing built-in functions so that they work with modified imagemap. 2010-07-29 20:22:03 +03:00
Martynas Mickevicius
1c1d555002 fixed a bug if a chart was drawn for a query result of one row 2010-07-29 20:12:10 +03:00
Martynas Mickevicius
0b620df912 enable warning report to the chart. 2010-07-29 19:15:08 +03:00
Martynas Mickevicius
57614902eb image map enchancements. 2010-07-29 19:06:11 +03:00
Marc Delisle
3e666e94de code and comments cleanup 2010-07-29 10:23:45 -04:00
Barry Leslie
c1bf8133cd fixed pbms_connection_pool_size problem 2010-07-29 10:01:57 -04:00
Barry Leslie
92a54bc0e2 Check for pbms functions. 2010-07-29 09:58:30 -04:00
Barry Leslie
279a8f8f21 The use of PBMS is not dependent on a primary key 2010-07-29 09:58:23 -04:00
Martynas Mickevicius
4577d63b4d commented the render function, thanks Herman 2010-07-29 16:18:35 +03:00
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local
Conflicts:
	server_status.php
2010-07-29 14:14:26 +03:00
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
Marc Delisle
d0fc397fe1 new database format string 2010-07-28 13:05:24 -04:00
Martynas Mickevicius
aecac3a691 trying to fix the title bug on the demo server 2010-07-28 16:28:58 +03:00
Martynas Mickevicius
c6ce98be18 moved setting defaults to the correct place. 2010-07-28 12:26:40 +03:00
Martynas Mickevicius
34ec78abb5 turned of shadow in the title 2010-07-28 11:27:32 +03:00
Martynas Mickevicius
4f62c6c2ea added font size setting 2010-07-28 11:02:17 +03:00
Crack
5a3ec082d8 fix user preferences in phpmyadmin.css.php
fix css for LightTabs
fix values in <select> lists
2010-07-27 23:15:23 +02:00
Crack
ac3e9e323b keep selected tab after save
change pmadb to phpMyAdmin configuration storage in warning string
2010-07-27 22:12:53 +02:00
Crack
65e0676ab4 remove SQL Validator from user preferences 2010-07-27 19:47:23 +02:00
Martynas Mickevicius
8b7e8257b3 bugfix for changed format 2010-07-27 18:32:47 +03:00
Martynas Mickevicius
039e30450c added setting for continuous image 2010-07-27 18:28:19 +03:00
Martynas Mickevicius
53c071941a forgot to swap label names 2010-07-27 18:26:50 +03:00
Martynas Mickevicius
0604e81526 bugfix and a query result format changes according to the latest wiki article about charts. 2010-07-27 18:11:01 +03:00