nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,379 Commits 1 Branch 0 Tags
63f64fa0cf3d11f6f6895f8da1e6245f0e45b51a
Commit Graph

3998 Commits

Author SHA1 Message Date
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04: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
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
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
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
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
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
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
lorilee
98ef84ebc3 New main page design 2010-07-23 20:31:52 -07:00
Marc Delisle
790b52857d remove tabs 2010-07-23 09:20:51 -04:00
Barry Leslie
36402785de Use PBMS pool connections 2010-07-23 08:32:16 -04:00
Marc Delisle
362aa516ac undefined $primary_field 2010-07-22 14:10:58 -04:00