nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,562 Commits 1 Branch 0 Tags
bf4ddebb63d9a66ba456b0e82e9f448b51e27ec2
Commit Graph

4370 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
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
Crack
b39567f381 revert disable/* options 2010-07-25 22:58:14 +02:00
ninadsp
fd4b33de85 Added handling of enum values to inline editing 2010-07-26 01:21:52 +05:30
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Martynas Mickevicius
b7daf5d985 removed overlib dependancy. Written simple tooltip. 2010-07-23 16:53:46 +03: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
Martynas Mickevicius
afe5f63c4b fixed radar chart tooltip text. 2010-07-23 13:54:19 +03:00
Martynas Mickevicius
25a59f23d5 chart is rendered in parts. Fixes the issue with browsers which have limited size on base64 images. 2010-07-23 13:19:30 +03:00
Marc Delisle
362aa516ac undefined $primary_field 2010-07-22 14:10:58 -04:00
Crack
2e55d85ab5 Developers tab no longer depends on UserprefsDisallow, introduced UserprefsDeveloperTab setting 2010-07-22 20:04:16 +02:00
Marc Delisle
ec9a60f8e0 undefined variables; unneeded config variables 2010-07-22 13:22:30 -04:00
Marc Delisle
56ebe05af7 blob streaming code cleanup (work in progress) 2010-07-22 13:15:27 -04:00
Leslie
b6349cd626 Removed unused code from db_operations.php. Changed blobstreaming.lib.php so that it check to see if blob streaming is enabled before doing anything and also uses an indirect method to create the 'pbms' database if it doesn't exist. 2010-07-22 11:23:48 -04:00
Barry Leslie
a8e5b0f275 Fix problem where PBMS daemon is not loaded or the 'pbms' database doesn't exist. 2010-07-22 11:23:44 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Barry Leslie
e65625ce1e Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:20:19 -04:00
Marc Delisle
8e98c5dd03 bug #3030862 (master only) inline sql edit got undefined 2010-07-22 08:47:47 -04:00
Martynas Mickevicius
e3736762ae cleaned JS for tooltips 2010-07-22 14:30:02 +03:00
Adnan
a7e3c0475c Merge Origin: Conflicts in js/functions.js 2010-07-22 16:03:50 +05:00
Crack
7ac7e24d8c more styling for disabled options 
new "Developer" tab (by default all options are disabled, users can't modify them)
fixed UserprefsDisallow export in setup script
 2010-07-22 01:29:36 +02:00
Martynas Mickevicius
557eb2096b added tooltips for radar charts. 2010-07-21 19:32:17 +03:00
Crack
7b0135ed6a fix port number validation 
correct naming mistake (authentication != authorization)
setup script: move server authentication settings to new tab
 2010-07-21 16:11:02 +02:00
Crack
600bdbd57e Setup script: AllowThirdPartyFraming 
User preferences and setup script: new tab - Warnings, with options to disable mcrypt, Suhosin and pmadb warnings
 2010-07-21 14:01:53 +02:00
Michal Čihař
06cf763358 [interface] Better formatting for SQL validator results. 2010-07-21 13:45:32 +02:00