nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,951 Commits 1 Branch 0 Tags
6fedaede3ae6cdacf43405e8b83da23e2afacdd2
Commit Graph

4660 Commits

Author SHA1 Message Date
ninadsp
5996773bf7 Removed the duplicate table link being shown in the serverinfo div. Most probably caused due to an incorrect merge resolution 2010-07-30 20:34:06 +05:30
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
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
ninadsp
2bec345a46 Trying to improve jQuery's behaviour for transformed field inline editing 2010-07-29 19:07:18 +05:30
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
Martynas Mickevicius
3afe966b51 added query results chart when results have only one column. 2010-07-27 12:52:46 +03: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