31 Commits

Author SHA1 Message Date
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
Crack
b2674e9d59 change tab order in server, db and table menus 2010-07-26 20:56:19 +02:00
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
104ac11c1d import and export for user preferences (currently JSON file only)
add preferences reset
2010-07-08 19:01:09 +02:00
Crack
104b40cb11 rename file 2010-07-08 12:36:09 +02:00
Crack
54c322544c move user preferences to top level server menu 2010-07-07 01:27:05 +02:00
ninadsp
6276ad45a6 Suppress the output if in an Ajax request 2010-05-28 13:05:04 +05:30
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
767d16a8fa bug #2972232 Import menu tab not present on main page 2010-03-17 17:50:23 -04:00
Marc Delisle
26c2543f37 message was hardcoded 2009-09-12 11:17:56 +00:00
Tomas Srnka
feb562e77b Replication support - tomas_zahra branch merged 2009-08-30 14:54:36 +00:00
Michal Čihař
215b8fa174 Added ability for synchronizing databases among servers.
Manual merge from branches/gsoc/zahra.
2009-08-24 14:39:38 +00:00
Marc Delisle
8480ffb665 improve function names 2009-06-07 11:09:13 +00:00
Marc Delisle
c010da50d8 bug #2473127 [display] Deleting rows displays tbl structure, not contents 2009-01-01 21:39:21 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Sebastian Mendel
86b1e3032b remove some space wasting elements - not finally, just let see how it is in work environment and how other say about 2007-10-09 12:56:33 +00:00
Sebastian Mendel
03caaca92a removed MySQL < 5 code 2007-10-02 09:35:51 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
55cecc1e61 fit with new logic of revision 10078 2007-03-15 21:29:21 +00:00
Michal Čihař
e789e40a0b Same title for processes link (RFE #1350356). 2006-02-22 11:31:32 +00:00
Michal Čihař
66aa9d2396 Move server_{links,common}.inc.php to libraries folder as it does not require direct access. 2005-11-24 08:29:44 +00:00