Marc Delisle
01d6fed4e2
fix merge conflicts
2010-06-30 11:37:53 -04:00
Marc Delisle
108f3305e9
bug: avoid loading twice a js file
2010-06-30 11:35:46 -04:00
ninadsp
466d3f7ae5
Discarded the unused PMA_ajaxOutputBuffelHandler() function.
2010-06-30 21:00:45 +05:30
ninadsp
bcbf327139
Merge remote branch 'origin/master'
2010-06-29 23:54:01 +05:30
Marc Delisle
116d1297af
solve merge conflicts
2010-06-29 08:23:47 -04:00
Marc Delisle
852ed51c27
bug [replication] Do not offer information_schema in the list of databases
2010-06-29 08:14:31 -04:00
Marc Delisle
f368184a12
fix typo; remove Id
2010-06-29 07:57:45 -04:00
Marc Delisle
90ac3d39a0
bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible
2010-06-29 07:56:10 -04:00
Marc Delisle
f463b1cc7a
bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible
2010-06-29 07:48:28 -04:00
lorilee
9bd658ae03
Removed inline Javascript, ENUM/SET editor message remains visible when Javascript is disabled
2010-06-28 22:28:25 -04:00
lorilee
301e3c43e3
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-06-28 20:50:26 -04:00
lorilee
f1a5ae3a9f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 20:49:56 -04:00
lorilee
cd7b5448f9
ENUM/SET editor
2010-06-28 20:48:41 -04:00
Dieter Adriaenssens
16ed06531a
remove author names
2010-06-28 20:36:12 +02:00
Crack
83f1397f0f
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 16:42:29 +02:00
Marc Delisle
4986ee0174
lang directory no longer exists; I guess this mechanism is no longer needed
2010-06-28 09:25:45 -04:00
ninadsp
9a4b524db7
Hacked the PMA_generate_slider_effect() code to work with jQuery. Ajax
...
queries were failing due to the use of document.write(). Need to find a
better solution with $.append()
2010-06-28 01:59:52 +05:30
ninadsp
a5ae31a220
Added an empty div which will be filled with the results of the SQL
...
query by jQuery
2010-06-28 01:22:55 +05:30
ninadsp
a3dd431bdb
Modified PMA_showMessage so that it can show the sql query even in an
...
ajax request, by using output buffering.
Added a function to handle the output buffer for the ajax request.
Fixed a typo in PMA_ajaxResponse
2010-06-27 23:03:20 +05:30
Crack
c91c105da8
added missing file
2010-06-27 12:43:54 +02:00
ninadsp
ac7cab7160
Revert "Revert "Merge remote branch 'origin/master'""
...
This reverts commit 4214d83e12
.
2010-06-26 15:45:27 +05:30
ninadsp
4214d83e12
Revert "Merge remote branch 'origin/master'"
...
This reverts commit c850b8be8b
, reversing
changes made to dcdde2f99f
.
2010-06-26 15:43:52 +05:30
ninadsp
c850b8be8b
Merge remote branch 'origin/master'
...
Conflicts:
po/tr.po
2010-06-26 15:38:12 +05:30
Adnan
cba214aee4
Export Relation Schema: deleting wrong name files
2010-06-26 11:16:11 +05:00
Crack
e842432c7e
User preferences:
...
- add icons to category tabs
- user overrides were unavailable in CSS files
- apply saved configuration immediately after save, reload navigation frame if it's affected
- disabled overrides marked in user preferences forms
2010-06-26 01:04:17 +02:00
Adnan
dd217e8dff
Export Relation Schema: renaming files + renaming classes according to pear standards
2010-06-25 19:14:47 +05:00
lorilee
2ef4025ec9
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-06-24 17:25:25 -04:00
lorilee
ab8bbae65b
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-24 17:15:39 -04:00
lorilee
8984ffffbb
Modified label text, added "doc" links
2010-06-24 17:14:20 -04:00
lorilee
0ede5e680b
Changed label name, added a hint for the "column names" field
2010-06-24 16:56:52 -04:00
lorilee
66c6a30185
Changed input element ID names to make more sense
2010-06-24 16:55:55 -04:00
Adnan
7660295dca
Schema Classes structure, PDF and SVG
2010-06-24 20:39:46 +05:00
Adnan
8dc2149272
Merge remote branch 'origin/master' into export_branch
2010-06-24 20:32:35 +05:00
Adnan
0e9f6247e4
Revert "schema classes structure"
...
This reverts commit 589eef3280
.
2010-06-24 20:26:14 +05:00
Marc Delisle
1be2d538df
fix merge conflicts
2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0
patch #2932113 Slow export when having lots of databases
2010-06-24 10:01:21 -04:00
Adnan
fc838dd0cb
Merge remote branch 'origin/master' into export_branch
2010-06-24 18:31:54 +05:00
Adnan
589eef3280
schema classes structure
2010-06-24 18:31:42 +05:00
Martynas Mickevicius
c2e7aef7ba
added configurable settings for title and labels
2010-06-23 14:06:57 +03:00
Martynas Mickevicius
278ee6e2ca
added curly braces where needed
2010-06-23 13:32:23 +03:00
Martynas Mickevicius
1cae244e89
fixed case error
2010-06-23 13:30:20 +03:00
lorilee
0a456e8681
Updated file selection form
2010-06-22 21:07:43 -04:00
lorilee
c9fa5b476e
<li> tags only shown when there is content in between them
2010-06-22 20:40:11 -04:00
lorilee
6913ce2a42
Removed inline CSS
2010-06-22 20:38:52 -04:00
Martynas Mickevicius
eeead42990
Moved settings to an array. Form fields to choose settings for query result chart.
2010-06-22 15:25:06 +03:00
Martynas Mickevicius
c5b49bb839
added stacked bar chart
2010-06-22 14:24:23 +03:00
ninadsp
cf15d940cd
Bug noticed by Marc Delisle in PMA_ajaxResponse fixed
2010-06-22 11:41:55 +05:30
Crack
e5238f3845
add $cfg['UserprefsDisallow'] and allow setting it in setup script
...
correct IE opacity issue for "restore default value" button
fix regressions introduced in previous commit
2010-06-21 19:12:25 +02:00
Crack
d09c35f5a8
setup script - better config file generation
2010-06-21 18:46:23 +02:00
Martynas Mickevicius
12d875dadc
early code to show a chart for query results
2010-06-21 17:35:42 +03:00