Commit Graph

103 Commits

Author SHA1 Message Date
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Rouslan Placella
7b85c709a8 Dropped server_links.inc.php 2012-05-05 16:44:27 +01:00
Michal Čihař
784ab679d1 Wrap some long lines 2012-04-27 08:56:13 +02:00
Jo Michael
72663d0bd4 Align server sync form fields properly, add labels 2012-04-20 23:45:56 +02:00
Madhura Jayaratne
fa9aaea8c0 Coding style improvements 2012-04-13 20:57:17 +05:30
Michal Čihař
5d54482c66 Drop $cfg['MainPageIconic']. 2012-04-11 15:34:27 +02:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Dieter Adriaenssens
e67e930328 improve coding style 2012-03-16 16:54:04 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Marc Delisle
1df108de90 Fix merge conflicts 2011-10-02 07:41:32 -04:00
Marc Delisle
2c7b06f543 Merge branch 'QA_3_4' 2011-10-02 07:35:54 -04:00
Marc Delisle
e27961b1b2 bug #3417089 [synchronize] Extraneous db choices 2011-10-02 07:25:45 -04:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
299da6d047 More style errors fixed 2011-09-23 11:36:14 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Piotr Przybylski
4cf5fe7997 Exclude data_dictionary from server synchronize (Drizzle) 2011-08-23 22:37:24 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
2011-08-17 16:39:43 +02:00
Dieter Adriaenssens
cbca775738 coding style and wrapping long lines 2011-08-17 00:09:17 +02:00
Piotr Przybylski
64926ead73 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-06 13:10:25 +02:00
Piotr Przybylski
67d5346da5 Fix typo 2011-08-06 11:02:25 +02:00
Piotr Przybylski
0219728929 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-05 22:48:03 +02:00
Piotr Przybylski
680cfbe726 Server Synchronize: better layout for displayed queries 2011-08-05 22:39:16 +02:00
Piotr Przybylski
990820f5fa Server Synchronize: fix a few cases of undefined variable warning 2011-08-05 22:38:50 +02:00
Piotr Przybylski
23389d2e4f Server Synchronize: make it fully work on servers other than the first one 2011-08-05 22:38:10 +02:00
Piotr Przybylski
ca9c30f1d6 Synchronize: allow to connect to local server through socket 2011-08-05 18:14:05 +02:00
Piotr Przybylski
381e172fcc Synchronize:
* Detect Drizzle servers
* disallow connections with incompatible protocols, these can't work with DBI functions defined in global namespace
2011-08-05 18:13:03 +02:00
Michal Čihař
21b5b87c92 Escape only parts which need it, not translated string 2011-08-05 10:32:34 +02:00
Piotr Przybylski
c64564baf7 Server synchronize: fix PMA_get_table_indexes to return null when there are no indexes instead of false
Synchronize code depends on this behavior
2011-08-05 00:49:31 +02:00
Piotr Przybylski
a73f1449ea Coding style: space after for keyword 2011-08-05 00:37:49 +02:00
Piotr Przybylski
54fbcaa140 Server synchronize:
* change icons to 16x16
* fix tables layout
* merge 'Source' and 'Target' tables
2011-08-02 23:30:51 +02:00
Michal Čihař
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Marc Delisle
ab1a2394c3 bug #3311170 [sync] Missing helper icons in Synchronize 2011-06-03 13:00:56 -04:00
Marc Delisle
71a533536b bug #3302872 [synchronize] Synchronize and user name 2011-05-16 12:53:10 -04:00
Marc Delisle
900a580089 - Bug #3301108 Synchronize and already configured host
- Also, some fields must be readonly instead of disabled
2011-05-12 12:57:28 -04:00
Marc Delisle
57e3aba8ff Bug #3168733 Synchronization does not honor AllowArbitraryServer 2011-04-20 06:32:00 -04:00
Marc Delisle
4a732d9b6c Clarify the meaning of host in this context (will help translations) 2011-03-23 12:53:24 -04:00
Marc Delisle
8d2531d658 In Synchronize panel, make image changes independant from the original theme 2011-03-11 13:16:36 -05:00
Michal Čihař
a0e72168ef Whitespace cleanup 2011-02-02 16:40:52 +01:00
Michal Čihař
38b4d8fd18 Use caption instead of tr/th for table caption 2011-02-02 16:40:48 +01:00
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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
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
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30