Commit Graph

16177 Commits

Author SHA1 Message Date
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
41bc587ed4 Merge branch 'QA_3_3' 2010-07-26 12:29:48 -04:00
Marc Delisle
e43fe5a8f1 3.3.5 release 2010-07-26 12:27:30 -04:00
Michal Čihař
6c3ad9e942 Fix back showing login form in frames. 2010-07-26 17:31:56 +02:00
Michal Čihař
d8324ec67a Update po files. 2010-07-26 17:18:45 +02:00
Michal Čihař
0933b7157d Merge remote branch 'pootle/master' 2010-07-26 17:18:16 +02:00
Michal Čihař
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Robert Readman
3d6e288651 Translation update done using Pootle. 2010-07-26 16:54:15 +02:00
Robert Readman
232ebc3c8c Translation update done using Pootle. 2010-07-26 16:53:54 +02:00
Michal Čihař
639dc7fcf6 Simplify inclusions of vendor_config. 2010-07-26 16:46:37 +02:00
Michal Čihař
f700a73c81 No need for require_once in these files. 2010-07-26 16:44:47 +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ř
c1f076000b No need to require_once here. 2010-07-26 16:28:56 +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
Michal Čihař
bcc372b5c5 Merge branch 'QA_3_3' 2010-07-26 15:51:48 +02:00
Michal Čihař
049fc7fef7 bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. 2010-07-26 15:51:26 +02:00
Michal Čihař
83d458aa05 Revert "bug #3031705 [core] Do not use CONCAT for DECIMAL fields."
This reverts commit ef500cd23f.

We probably need to use CONCAT still, just the other side should be
converted to string as well.
2010-07-26 15:45:36 +02:00
Michal Čihař
15dfc4879e Drop collation description cache.
It really does not improve performance much and it just consumes memory.
Anyway on most pages this function is called just once for each
collation, so all it does is filling up the cache but never using it.
2010-07-26 13:29:29 +02:00
gheni
412bdd6515 Translation update done using Pootle. 2010-07-26 05:01:31 +02:00
gheni
815aceda7b Translation update done using Pootle. 2010-07-26 05:00:08 +02:00
gheni
3954599b68 Translation update done using Pootle. 2010-07-26 04:59:59 +02:00
gheni
d18869b2c9 Translation update done using Pootle. 2010-07-26 04:59:54 +02:00
gheni
35171f4c88 Translation update done using Pootle. 2010-07-26 04:58:23 +02:00
gheni
e1e57f4a0d Translation update done using Pootle. 2010-07-26 04:56:36 +02:00
gheni
73eaafe0c6 Translation update done using Pootle. 2010-07-26 04:54:47 +02:00
gheni
0617cdb0c5 Translation update done using Pootle. 2010-07-26 04:53:44 +02:00
gheni
f37c7cb55c Translation update done using Pootle. 2010-07-26 04:53:15 +02:00
gheni
0a11d949cb Translation update done using Pootle. 2010-07-26 04:52:34 +02:00
gheni
c0560b64f5 Translation update done using Pootle. 2010-07-26 04:52:29 +02:00
gheni
e491ab718d Translation update done using Pootle. 2010-07-26 04:52:02 +02:00
gheni
629af6d8ce Translation update done using Pootle. 2010-07-26 04:51:03 +02:00
gheni
21d4df09ba Translation update done using Pootle. 2010-07-26 04:50:04 +02:00
gheni
16d651fa09 Translation update done using Pootle. 2010-07-26 04:49:38 +02:00
Crack
8d24baad94 run submenu code only when #topmenu is present
todo update
2010-07-25 22:58:52 +02:00
Crack
b39567f381 revert disable/* options 2010-07-25 22:58:14 +02:00
Crack
5afd385f30 create menu for menu tabs which don't fit in one line
fix tooltip.js error when not in pma frame
2010-07-25 22:10:38 +02:00
Marc Delisle
cdcc5d7443 Merge branch 'QA_3_3' 2010-07-25 13:33:03 -04:00
Marc Delisle
053d6ca88e bug #3033063 [core] Navi gets wrong db name 2010-07-25 13:32:35 -04:00
Marc Delisle
0a05b396b3 Merge branch 'MAINT_3_3_5' 2010-07-25 07:54:43 -04:00