Commit Graph

4154 Commits

Author SHA1 Message Date
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
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
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
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
Michal Čihař
05160b3e03 No need for full columns here. 2010-07-27 10:07:55 +02:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
Michal Čihař
01ded03e89 Remove duplicate info. 2010-07-27 09:51:34 +02:00
Michal Čihař
39e4c95813 Remove drop/empty table links from table tabs. 2010-07-27 09:42:46 +02:00
Michal Čihař
36b6328931 Remove drop tab from database tabs. 2010-07-27 09:42:08 +02:00
Michal Čihař
a47c6e8bea This might be called without initialized gettext. 2010-07-27 09:11:18 +02:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	server_export.php
2010-07-26 13:42:42 -07:00
Crack
b2674e9d59 change tab order in server, db and table menus 2010-07-26 20:56:19 +02:00
Crack
812748a50d Changes to conform to latest merge:
- use require instead if require_once for footer.inc.php
- rename pmadb to phpMyAdmin configuration storage
2010-07-26 20:34:31 +02:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/config.values.php
2010-07-26 20:24:57 +02:00
Marc Delisle
f3f073a0ba 3.3.5 release 2010-07-26 12:26:41 -04:00
Michal Čihař
6c3ad9e942 Fix back showing login form in frames. 2010-07-26 17:31:56 +02:00
Michal Čihař
639dc7fcf6 Simplify inclusions of vendor_config. 2010-07-26 16:46:37 +02:00
Michal Čihař
ebc3f1b3c6 Included just once. 2010-07-26 16:43:26 +02:00
Michal Čihař
ed34bb9054 Adjust documentation to gettext. 2010-07-26 16:41:49 +02:00
Michal Čihař
5f88219d18 Included only from single place, no need for require_once. 2010-07-26 16:40:43 +02:00
Michal Čihař
5684d40059 Documentation. 2010-07-26 16:39:55 +02:00
Michal Čihař
9da795245e It makes no sense load translations here
Either the message is translated or not, but we can not do much about
it.
2010-07-26 16:39:04 +02:00
Michal Čihař
180018d4dc Drop suppor from PMA_fatalError for str* variables.
It is not used anywhere now.
2010-07-26 16:38:31 +02:00
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
Michal Čihař
81a4fdf0c9 No need for require_once for once included code. 2010-07-26 16:35:24 +02:00
Michal Čihař
2dffa21b0c Loaded by common. 2010-07-26 16:28:23 +02:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00