Piotr Przybylski
9d7d5f960f
Remove unused variables
2011-08-05 16:46:24 +02:00
Michal Čihař
cdd2044274
Add some missing spacing in docblocks
2011-08-05 15:50:14 +02:00
Michal Čihař
9998646600
Add some docblocks
2011-08-05 15:46:59 +02:00
Michal Čihař
4afb63d08f
Upgrade to jQuery 1.6.2
...
This should be compatible with 1.6.1 and my tests show no problems.
2011-08-05 15:31:38 +02:00
Michal Čihař
37ec6cae84
Add some docblocks
2011-08-05 15:23:04 +02:00
Michal Čihař
52375334c3
Add some docblocks
2011-08-05 15:21:24 +02:00
Michal Čihař
5c0ec4b9f3
Reformat docblocks
2011-08-05 15:17:15 +02:00
Michal Čihař
be0989e944
Reformat docblock
2011-08-05 15:15:11 +02:00
Michal Čihař
024e164f02
Add doc
2011-08-05 15:14:39 +02:00
Michal Čihař
b6c6e79dc2
Reformat docblock
2011-08-05 15:13:40 +02:00
Michal Čihař
64c30e51e7
Coding style, class definitions
2011-08-05 15:12:08 +02:00
Tyron Madlener
f4afe963b6
Advisor:
...
- l10n in php/js code
- code style improvements
- ui style improvements
- syntax/run errors in advisory_rules.txt are now displayed in advisor tab
2011-08-05 15:50:06 +03:00
Michal Čihař
1ec0b69e6b
Coding style, function definitions
2011-08-05 14:49:23 +02:00
Michal Čihař
309c44e633
Merge remote-tracking branch 'tyron/master'
...
Conflicts:
js/functions.js
2011-08-05 13:25:06 +02:00
Michal Čihař
9c7eea8aeb
Better error message
2011-08-05 10:50:58 +02:00
Michal Čihař
81aadb883f
Better error message
2011-08-05 10:49:49 +02:00
Michal Čihař
95b0af8892
Avoid composite messages
2011-08-05 10:47:03 +02:00
Michal Čihař
654228e091
Avoid composite messages
2011-08-05 10:43:31 +02:00
Michal Čihař
21b5b87c92
Escape only parts which need it, not translated string
2011-08-05 10:32:34 +02:00
Michal Čihař
4833db7d64
Add some docblocks
2011-08-05 10:17:16 +02:00
Michal Čihař
8880f996bf
Add some docblocks
2011-08-05 10:15:35 +02:00
Tyron Madlener
af6f02c03b
Merge remote-tracking branch 'origin/master'
2011-08-05 10:50:11 +03:00
Tyron Madlener
0c514efe7c
Grammar fix
2011-08-05 10:50:00 +03:00
Michal Čihař
dd2dc3a5a7
Shortcut when export can not work
2011-08-05 08:19:18 +02:00
Michal Čihař
872a2e6079
Remove unused variable
2011-08-05 08:17:08 +02:00
Michal Čihař
d7e0002af6
Fix variable name
2011-08-05 08:17:00 +02:00
Michal Čihař
9f029508df
Whitespace cleanup
2011-08-05 08:14:27 +02:00
Michal Čihař
c3e5c3a329
Remove unused variable
2011-08-05 08:14:21 +02:00
Aris Feryanto
79e4e4fb88
Merge branch 'grid' into aris
2011-08-05 09:56:33 +08:00
Aris Feryanto
9adfe5b99c
Grid edit: change the default cfg['SaveCellsAtOnce'] to false
2011-08-05 09:56:23 +08:00
Piotr Przybylski
ca8a30f7f8
Fix usage of PMA_DBI_get_columns
2011-08-05 01:24:02 +02:00
Piotr Przybylski
a5ff5e860d
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/database_interface.lib.php
tbl_structure.php
2011-08-05 01:18:56 +02:00
Piotr Przybylski
6fe137e68d
PMA_DBI_get_columns - return null when there are no columns (server synchronize depends on this behavior)
2011-08-05 01:15:37 +02:00
Piotr Przybylski
d5cb3b6997
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/server_synchronize.lib.php
2011-08-05 00:52:47 +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
66665f326a
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
db_qbe.php
js/server_status.js
libraries/export/xml.php
libraries/schema/Pdf_Relation_Schema.class.php
tbl_printview.php
tbl_structure.php
2011-08-04 20:19:43 +02:00
Michal Čihař
4c62a5fed6
Another typo
2011-08-04 17:41:30 +02:00
Michal Čihař
416277f398
Use standard field processing machinery
2011-08-04 17:16:03 +02:00
Michal Čihař
57ab1b3e20
No longer needed
2011-08-04 17:12:08 +02:00
Michal Čihař
48149c261c
Use already calculated values
2011-08-04 17:11:47 +02:00
Michal Čihař
83d3c0d2fd
Move attribute processing to PMA_extractFieldSpec
2011-08-04 17:08:49 +02:00
Michal Čihař
f646fc8a55
Use PMA_extractFieldSpec instead of own code
2011-08-04 17:04:12 +02:00
Michal Čihař
822a863690
Reintroduce mistakenly removed code
2011-08-04 16:47:47 +02:00
Michal Čihař
b7b7fe3920
Properly handle special cases
2011-08-04 16:46:45 +02:00
Michal Čihař
d29cf3227d
Use PMA_extractFieldSpec instead of own code in export plugins
2011-08-04 16:41:30 +02:00
Michal Čihař
542738dd88
Export print_type and make it usable for set/enum as well
2011-08-04 16:33:34 +02:00
Michal Čihař
5adf2fb352
Processing of varbinary fields
2011-08-04 16:21:47 +02:00
Michal Čihař
57dcfb780a
Fater processing
...
- use preg_replace return value instead going through string again
- use strpos instead of strstr, which is faster and consumes less memory
according to PHP docs
2011-08-04 16:20:42 +02:00
Michal Čihař
b604a67c50
Optimize matching
...
- avoid calling twice same preg_match
- do case sensitive match as we have the string in lower case
2011-08-04 16:15:13 +02:00
Michal Čihař
04c5a81b8c
Make short type also always lowercase
2011-08-04 16:10:41 +02:00
Michal Čihař
42df62c050
Make type lowercase everytime
2011-08-04 16:09:17 +02:00
Michal Čihař
b231ab4072
Factor out some type matching
2011-08-04 15:56:56 +02:00
Michal Čihař
398d5abbda
Use PMA_DBI_get_columns
2011-08-04 15:43:07 +02:00
Michal Čihař
9fd0baaad2
Fix indentation
2011-08-04 15:38:13 +02:00
Michal Čihař
5e2a467f6f
$GLOBALS[use_backquotes] is apparently not set anywhere
2011-08-04 15:30:02 +02:00
Michal Čihař
1045c8f085
Wrap export options
2011-08-04 15:28:02 +02:00
Michal Čihař
ff074b1d2f
Better parameter name
2011-08-04 15:21:06 +02:00
Michal Čihař
a665c7d8a6
Fix docblock
2011-08-04 15:20:19 +02:00
Michal Čihař
8fcb4720e2
Include length in headers when we know it
2011-08-04 15:06:09 +02:00
Michal Čihař
99faf22237
Add missing docs
2011-08-04 15:03:31 +02:00
Michal Čihař
94ac586dba
Move avoid_cache to end, it is not used so often as size
2011-08-04 15:02:35 +02:00
Michal Čihař
fa300e3887
Missing doc
2011-08-04 14:59:45 +02:00
Michal Čihař
73fb08d3d8
Revert "Feature idea: Collapsible navigation frame"
...
This reverts commit 5fb7f9cd17
2011-08-04 14:41:29 +02:00
Michal Čihař
a2fc059f98
Fix syntax error
2011-08-04 14:39:45 +02:00
Michal Čihař
1369bf2c43
Document weirdness
2011-08-04 14:38:59 +02:00
Michal Čihař
b4a2dc7196
Use new function for download headers
2011-08-04 14:38:07 +02:00
Michal Čihař
bbaeb8922b
Use new function for download headers
2011-08-04 14:37:42 +02:00
Michal Čihař
2283b016bb
Use HTTP/1.1 for all browsers
2011-08-04 14:35:36 +02:00
Michal Čihař
6ef6ab3d79
Add some comments
2011-08-04 14:33:11 +02:00
Michal Čihař
cb337bbb02
Use new function for no cache headers
2011-08-04 14:32:02 +02:00
Michal Čihař
7281d04793
Factor out no caching headers
2011-08-04 14:31:32 +02:00
Michal Čihař
e7db079b81
Use predefined PHP constant for date instead of manually defining format
2011-08-04 14:24:15 +02:00
Michal Čihař
aa5156463b
Allow spaces in filename
2011-08-04 14:22:41 +02:00
Michal Čihař
34da1ea053
Use new function for download headers
2011-08-04 14:22:05 +02:00
Michal Čihař
c79fc30deb
Use new function for download headers
2011-08-04 14:21:27 +02:00
Michal Čihař
b68145bf88
Use new function for download headers
2011-08-04 14:21:01 +02:00
Michal Čihař
7afe37b0a5
Use new function for download headers
2011-08-04 14:20:32 +02:00
Michal Čihař
69a69a5fb8
Use new function for download headers
2011-08-04 14:19:53 +02:00
Michal Čihař
b9f1fe6bfa
Include no caching headers
2011-08-04 14:18:32 +02:00
Michal Čihař
66f9667a61
Generic function for sending download headers
2011-08-04 14:17:07 +02:00
Piotr Przybylski
3fa5e89bb2
Drizzle DBI: default to fully buffered query, like in mysql and mysqli
2011-08-04 14:14:05 +02:00
Michal Čihař
41bbe32b12
Merge remote-tracking branch 'tyron/master'
...
Conflicts:
js/functions.js
2011-08-04 13:58:20 +02:00
Michal Čihař
0d9a0cb42b
Simplify logic
2011-08-04 13:49:15 +02:00
Michal Čihař
4fb5b65fd2
Remove unused parameter $container from PMA_getIcon
2011-08-04 13:47:44 +02:00
Michal Čihař
7a07c42de5
Variable include_box is not used
2011-08-04 13:40:49 +02:00
Michal Čihař
eae8396f1e
Factor out pow function detection
2011-08-04 13:39:11 +02:00
Aris Feryanto
53fec4ac4d
Merge branch 'recent' into aris
2011-08-04 18:27:46 +08:00
Aris Feryanto
376cc353dc
Recent table: fix bug - not work for db or table name containing custom characters
2011-08-04 18:27:37 +08:00
Aris Feryanto
0e39df6ca4
add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function
2011-08-04 16:27:47 +08:00
Tyron Madlener
218d31aefc
Advisor Fixes
2011-08-04 11:16:41 +03:00
Tyron Madlener
63dd549550
- Status variables, new filter: 'Show unformatted values'
...
- Advisory System v0.1
- A simple rules engine implementation (advisor.lib.php)
- 51 performance rules based on the mysqltuner 2.0 rules, heavily improved and some newly added (advisory_rules.txt)
- 'Advisory' Tab displaying the recommendations
2011-08-04 10:43:57 +03:00
Piotr Przybylski
11f2c43f11
Merge remote-tracking branch 'origin/master' into drizzle
2011-08-03 23:58:48 +02:00
Piotr Przybylski
95e90bbba4
Comments and formatting
2011-08-03 23:56:02 +02:00
Madhura Jayaratne
55c6eacf3e
Merge branch 'QA_3_4'
2011-08-04 00:07:04 +05:30
Madhura Jayaratne
68e21b05e4
Changelog entry for bug #3383711 . Some formatting
2011-08-04 00:04:16 +05:30
Sven Strickroth
7909da2ea0
quick fix for issue #3383711
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-03 23:48:42 +05:30
Madhura Jayaratne
c1f586b9fd
Bug #3383904 - Column comments are not displayed
2011-08-03 20:48:28 +05:30
Madhura Jayaratne
3da9f02130
Merge branch 'master' into OpenGIS
2011-08-03 18:17:57 +05:30
Madhura Jayaratne
175a6e0948
Use hexadecimal form to create a unique condition for geometry fields
2011-08-03 18:11:32 +05:30
Aris Feryanto
341e18b10f
Merge branch 'grid' into aris
2011-08-03 11:59:03 +08:00
Ammar Yasir
e4b676e356
Merge remote branch 'phpmyadmin/master'
2011-08-03 09:15:29 +05:30
Aris Feryanto
91d85841fc
Grid edit: fix bug - update where_clause precisely (previous version cannot handle space or special characters)
2011-08-03 10:21:41 +08:00
Piotr Przybylski
ce7e6feaf5
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/export/htmlword.php
libraries/export/latex.php
libraries/export/odt.php
libraries/export/sql.php
libraries/export/texytext.php
libraries/export/xml.php
2011-08-03 00:25:43 +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
Piotr Przybylski
0427378a05
Allow to use noclick class on table level
2011-08-02 23:14:52 +02:00
Madhura Jayaratne
7fe1ce201f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-08-03 00:53:53 +05:30
Michal Čihař
9fcb5e7c86
Merge branch 'fix-inlineedit' of git://github.com/csware/phpmyadmin into integration
2011-08-02 16:04:07 +02:00
Michal Čihař
98cff52cf8
Fix indentation in few places
2011-08-02 15:54:52 +02:00
Michal Čihař
3769b849aa
Forgot to reindent some files
2011-08-02 15:53:19 +02:00
Michal Čihař
7e7be00f84
Forgot to reindent this one
2011-08-02 15:50:44 +02:00
Michal Čihař
8cb1f3a1cc
Fix indentation
2011-08-02 15:25:27 +02:00
Tyron Madlener
5ec242bc14
Small improvements:
...
- Byte value also for query_cache_limit
- In Status and Server variables, '_' and ' ' can be used interchangably, but only worked for the first occurence
- For analysing queries from slow query log, database name is passed on and selected prior to analyzing the query
- Timespan format also for Uptime
2011-08-02 11:25:26 +03:00
Aris Feryanto
8eff621a15
Fix bug - duplicate ID in some data and text for makegrid.js
2011-08-02 10:20:41 +08:00
Piotr Przybylski
dfec5a4732
Merge remote-tracking branch 'origin/master' into drizzle
2011-08-01 18:05:53 +02:00
Piotr Przybylski
997a5ea14c
Comment change
2011-08-01 18:03:33 +02:00
Sven Strickroth
6ec8bb013b
extend PMA_DBI_get_definition to support views
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-01 15:38:10 +02:00
Sven Strickroth
dff4e25c55
inline editing a SQL query doesn't work if it's too long
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-01 15:05:18 +02:00
Piotr Przybylski
9ed5177320
Drizzle dbi - PMA_DBI_get_client_info should return Drizzle version it was built for
2011-08-01 13:35:30 +02:00
Aris Feryanto
11e1ead21c
Merge remote-tracking branch 'origin/master' into aris
2011-08-01 17:22:44 +08:00
Madhura Jayaratne
3611d48325
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-08-01 09:40:36 +05:30
Madhura Jayaratne
304a5d666b
Avoid undefined variables
2011-08-01 00:25:02 +05:30
Piotr Przybylski
0a4ddb3f67
Remove unused function: PMA_lang_link_replace
2011-07-31 20:41:03 +02:00
Piotr Przybylski
878cff0205
Comments
2011-07-31 20:41:03 +02:00
Madhura Jayaratne
fe10dec01f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-31 23:25:33 +05:30
Madhura Jayaratne
f00b473c17
Accept WKTs without SRID
2011-07-31 23:14:43 +05:30
Madhura Jayaratne
e62c03f7a5
Avoid undefined index
2011-07-31 22:28:02 +05:30
Madhura Jayaratne
7a955d4c66
GIS data editor to insert geometry type parameters
2011-07-31 21:55:21 +05:30
Piotr Przybylski
d7bea4d4ee
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-31 17:26:18 +02:00
Piotr Przybylski
8824da9ed8
Fix links in messages shown by setup script
2011-07-31 17:23:34 +02:00
Piotr Przybylski
9b01642c95
Fix test_db_connection() for connections via socket
2011-07-31 15:16:07 +02:00
Piotr Przybylski
6a54e26318
Remove information about PHP 4.3, the minimal supported version is now 5.2
2011-07-31 15:07:09 +02:00
Tyron Madlener
b04ca6294a
Merge remote-tracking branch 'origin/master'
...
Conflicts:
server_status.php
2011-07-31 16:00:15 +03:00
Madhura Jayaratne
3efcd0e24b
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGIS
2011-07-31 16:24:20 +05:30
Madhura Jayaratne
ed5c01dc44
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-31 16:13:26 +05:30
Ammar Yasir
32969f3d42
Merge remote branch 'phpmyadmin/master'
2011-07-31 07:14:01 +05:30
Piotr Przybylski
e1799393f3
Validation for drizzle module in setup script
...
Untested and currently unused, it's too unsafe to allow users to choose it
2011-07-31 00:50:58 +02:00
Piotr Przybylski
b57fda5b3d
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-31 00:46:49 +02:00
Piotr Przybylski
e3b91b7a0b
PMA_DBI_fetch_value, PMA_DBI_fetch_single_row and PMA_DBI_fetch_result don't need to cache affected rows because there are none
2011-07-31 00:44:42 +02:00
Piotr Przybylski
7897967c76
Drizzle dbi:
...
* fix PMA_DrizzleResult::fetchRow with FETCH_BOTH
* add method call logging
2011-07-30 22:38:46 +02:00
Madhura Jayaratne
c73380be35
Make it more readable
2011-07-31 01:26:31 +05:30
Piotr Przybylski
7bc8d8348d
Drizzle dbi - segfault suddenly disappeared from there so use proper code
2011-07-30 21:51:14 +02:00
Piotr Przybylski
c7dd3244c6
Drizzle dbi - PMA_DBI_get_host_info - work around a segfault
2011-07-30 21:45:23 +02:00
Madhura Jayaratne
e456f22149
Detect the output type of the functions being applied
2011-07-31 01:11:11 +05:30
Madhura Jayaratne
47a8dcfc88
Function based search - for unary functions
2011-07-30 22:57:34 +05:30
Madhura Jayaratne
aed7270cb9
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-30 22:53:07 +05:30
Piotr Przybylski
c44f28a828
Fix affectedRows for drizzle dbi, circumvent a few drizzle module segfaults related to resource freeing
2011-07-30 18:49:47 +02:00
Piotr Przybylski
d35ec740a0
Marked drizzle dbi as experimental
2011-07-30 18:47:02 +02:00
Tyron Madlener
a2b6df6fb7
Merge remote-tracking branch 'origin/master'
2011-07-29 18:18:26 +03:00
Piotr Przybylski
f777dc3db5
Work around some segfaults in drizzle extension, still some segfaults left
...
Version 0.5 of PHP extension is definitely not production ready
2011-07-29 17:17:11 +02:00
Piotr Przybylski
eb18aeeeb2
Remove debug code
2011-07-29 17:14:22 +02:00
Aris Feryanto
aab31fec92
Merge branch 'grid' into aris
2011-07-29 18:12:44 +08:00
Aris Feryanto
49a4ee05c9
Merge remote-tracking branch 'origin/master' into aris
2011-07-29 18:12:41 +08:00
Aris Feryanto
5cf1288f91
Grid edit: 2 fixes - update edited field correctly when SaveCellsAtOnce is false; enable edit field after save AJAX request is complete
2011-07-29 17:59:55 +08:00
Aris Feryanto
351afca2c7
Grid edit: null-related things
2011-07-29 12:48:39 +08:00
Madhura Jayaratne
808447af1e
Merge branch 'QA_3_4'
2011-07-29 06:39:58 +05:30
Madhura Jayaratne
11ad4fd992
bug #3313235 [interface] Error div misplaced
2011-07-29 06:38:07 +05:30
Piotr Przybylski
4e22743b37
A few bugfixes for drizzle dbi
2011-07-28 22:46:40 +02:00
Piotr Przybylski
abdf808dee
Correctly detect drizzle extension
2011-07-28 22:46:19 +02:00
Piotr Przybylski
11a8690541
database interface files for drizzle PHP extension
2011-07-28 19:21:18 +02:00
Piotr Przybylski
f06cabeca7
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-28 13:33:44 +02:00
Piotr Przybylski
c326cfeec4
Comments
2011-07-28 13:32:38 +02:00
Madhura Jayaratne
003496969e
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-28 06:01:39 +05:30
Piotr Przybylski
5f8842739d
Remove invalid usage of $php_errormsg
2011-07-27 21:26:28 +02:00
Piotr Przybylski
0eca09ffff
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/dbi/mysqli.dbi.lib.php
2011-07-27 20:10:38 +02:00
Piotr Przybylski
e82682d0e4
Simplify PMA_DBI_free_result
...
It was never used with multiple arguments
2011-07-27 19:59:49 +02:00
Piotr Przybylski
b9ff7b7ce2
Support persistent connections with mysqli extension (only PHP 5.3.0 and newer)
2011-07-27 19:59:49 +02:00
Piotr Przybylski
f43517efb5
mysql extension - remove 'persistent' parameter
...
Was named 'persistant' and never used/documented
2011-07-27 19:59:49 +02:00
Piotr Przybylski
46cd0f9a09
Comments
2011-07-27 19:59:49 +02:00
Piotr Przybylski
b0ce7c20c4
Improve readability
2011-07-27 19:59:48 +02:00
Piotr Przybylski
69ac509584
This should be checked in common, not in dbi library
2011-07-27 19:59:48 +02:00
Piotr Przybylski
2141b5fe81
Fix incorrect variable name
...
persistant > persistent
2011-07-27 19:59:48 +02:00
Tyron Madlener
5fb7f9cd17
Feature idea: Collapsible navigation frame
2011-07-27 12:56:40 +03:00
Aris Feryanto
b81acce4c9
Merge remote-tracking branch 'origin/master' into grid
2011-07-27 10:16:53 +08:00
Aris Feryanto
c3547776a7
Merge remote-tracking branch 'origin/master' into aris
2011-07-27 10:16:26 +08:00
Madhura Jayaratne
b48a250ca8
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-26 21:45:43 +05:30
Aris Feryanto
4d3c9541de
Merge branch 'grid' into aris
2011-07-26 18:33:02 +08:00
Aris Feryanto
338552b21d
Grid edit: change cfg['SaveCellsAtOnce'] default to true
2011-07-26 18:32:46 +08:00
Aris Feryanto
4b0cd86ea7
Merge branch 'grid' into aris
2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21
Grid edit: add configuration to save edited cell(s) at once
2011-07-26 18:30:40 +08:00
Piotr Przybylski
f2935d56d9
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
js/server_status.js
server_status.php
2011-07-25 21:55:16 +02:00
Ammar Yasir
cb63a92b44
Merge remote branch 'phpmyadmin/master'
2011-07-25 19:46:55 +05:30
Marc Delisle
09b30b8b6e
3.4.4-rc1
2011-07-25 10:15:14 -04:00
Marc Delisle
871aaa9b64
3.4.5-dev
2011-07-25 10:12:37 -04:00
Michal Čihař
3638bbd345
Fix typo
2011-07-25 14:46:33 +02:00
Michal Čihař
ffe203b099
Simplify definition of new valid links
2011-07-25 14:38:05 +02:00
Michal Čihař
765d823bbd
Better function names
2011-07-25 14:35:52 +02:00
Michal Čihař
2cc790bad2
Coding style
2011-07-25 14:34:44 +02:00
Michal Čihař
c44b0eacec
Fix docblocks
2011-07-25 14:32:09 +02:00
Michal Čihař
8d589ed83e
Fix matching of tags without target
2011-07-25 14:12:22 +02:00
Michal Čihař
0c57cb20e2
Use preg_replace_callback for interpreting [a@...]
...
This way we need to evaluate regullar expression only once and can
convert all correct links rather than replacing none in case one string
is broken.
2011-07-25 14:05:57 +02:00
Michal Čihař
55c6412e6c
Add documentation
2011-07-25 13:56:19 +02:00
Michal Čihař
a4807a8e7c
Improve check for valid links
2011-07-25 13:54:09 +02:00
Michal Čihař
17cd1ebe2b
Use single function for bbcode implementation
2011-07-25 12:11:17 +02:00
Aris Feryanto
6750af6767
Merge branch 'grid' into aris
2011-07-25 18:10:34 +08:00
Aris Feryanto
e1d927efa7
Merge remote-tracking branch 'origin/master' into aris
2011-07-25 18:10:29 +08:00
Aris Feryanto
4c30640024
Grid edit: add truncated support for TEXT data type
2011-07-25 18:09:11 +08:00
Michal Čihař
c3daf8bc52
Wrap long lines and make it more readable
2011-07-25 11:53:02 +02:00
Michal Čihař
f34dfda0fe
Merge remote-tracking branch 'tyron/master'
...
Conflicts:
js/functions.js
js/server_status.js
js/sql.js
libraries/common.lib.php
server_status.php
themes/pmahomme/css/theme_left.css.php
2011-07-25 11:32:22 +02:00
Ammar Yasir
18a6f0b070
Merge remote branch 'phpmyadmin/master'
2011-07-25 04:49:22 +05:30
Madhura Jayaratne
ec7feea9b0
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
libraries/import.lib.php
libraries/zip_extension.lib.php
2011-07-24 23:05:35 +05:30
Madhura Jayaratne
11ca5daa41
Change of color
2011-07-24 22:30:52 +05:30
Madhura Jayaratne
1f2ba4e9cc
Resolves problems with point and multipoint visualizations due to the assumption of empty values as zeros
2011-07-24 22:17:03 +05:30
Marc Delisle
35a5f31283
Merge branch 'QA_3_4'
2011-07-24 08:08:51 -04:00
Marc Delisle
08ee54d4a4
bug #3358750 [core] With Suhosin, urls are too long in edit links
2011-07-24 08:08:38 -04:00
Piotr Przybylski
e94e42fb73
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-23 23:33:19 +02:00
Marc Delisle
7e197b695e
Fix merge conflicts
2011-07-23 08:25:49 -04:00
Marc Delisle
3534dda30a
Fix merge conflicts
2011-07-23 08:16:00 -04:00
Tyron Madlener
ace73f25bb
- Added missing CSS Sprites, Icon sprites now also for PMA_linkOrButton()
...
- Rewrote PMA_linkOrButton() to rely on Javascript, making the code way less complicated
- Removed legacy support of Javascript 1.1 or lower
- Fixed a bug in cases where PMA_linkOrButton() creates a form, which when clicked required a js confirm, the confirm is being displayed a second time after the form is submitted.
2011-07-23 09:23:18 +03:00
Marc Delisle
c968408de7
Merge branch 'QA_3_4'
2011-07-22 09:35:51 -04:00
Sven Strickroth
201ad07ea8
Do not add backquotes for normal displayed text
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-07-22 09:33:30 -04:00
Michal Čihař
4a80c3e62d
Merge remote-tracking branch 'origin/QA_3_4'
2011-07-22 15:17:25 +02:00
Sven Strickroth
54398f8a12
Do not call PMA_showHint with bbcode=true in display_tbl.lib.php
...
This fixes an issue with an InnoDB-table on sql.php with "select * from tbl" showing that "total ~ N <sup>1</sup>" rows are displayed and with a JavaScript enabled browser the footnote gets hidden and it's impossible to find out what the <sup>1</sup> means.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-07-22 15:16:13 +02:00
Ammar Yasir
95ea722d73
Fixed redirection issue on tbl_zoom_select.php page
2011-07-22 17:51:53 +05:30
Piotr Przybylski
13f0d7a5d5
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-22 14:13:11 +02:00
Piotr Przybylski
2dee226c50
Add missing HTML escaping
2011-07-22 14:11:59 +02:00
Piotr Przybylski
a7fe9db581
Change strings
2011-07-22 14:09:57 +02:00
Piotr Przybylski
a04f592a92
Don't use DEFAULT CHARACTER SET when creating tables during import (Drizzle)
2011-07-22 13:39:23 +02:00
Ammar Yasir
7c66a8bed5
Merge remote branch 'phpmyadmin/master'
...
Conflicts:
js/highcharts/highcharts.js
2011-07-22 16:50:30 +05:30
Michal Čihař
60fdffbafa
Merge remote-tracking branch 'rouslan/rte'
2011-07-22 11:56:33 +02:00
Piotr Przybylski
3586bb992f
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
db_structure.php
libraries/database_interface.lib.php
libraries/server_synchronize.lib.php
server_status.php
sql.php
2011-07-22 11:07:04 +02:00
Tyron Madlener
9ee8ff38c3
Replaced qtTip js library with non-minified version.
2011-07-22 11:41:13 +03:00
Michal Čihař
d55306252b
Replace tabs with spaces, cleanup identation
2011-07-22 10:15:08 +02:00
Michal Čihař
3f8badd37f
Replace tabs with spaces, cleanup identation
2011-07-22 09:53:41 +02:00
Michal Čihař
b8d5cee5d7
Fix indentation
2011-07-22 09:39:00 +02:00
Michal Čihař
bf9def5d50
Wrap some long lines
2011-07-22 09:29:41 +02:00
Michal Čihař
6b75d60e91
Document that this is IPv4 only
2011-07-22 09:27:49 +02:00
Michal Čihař
236582fb4f
Fix mistakenly broken regexp
2011-07-22 09:25:14 +02:00
Michal Čihař
9405dbb82a
Fix spacing after @param
2011-07-22 09:21:55 +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
Aris Feryanto
4d9715e6ca
Merge remote-tracking branch 'origin/master' into grid
2011-07-22 09:10:35 +07:00
Aris Feryanto
fd3927cc00
Merge remote-tracking branch 'origin/master' into aris
2011-07-22 09:00:47 +07:00
Madhura Jayaratne
47fdfad336
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
libraries/gis/pma_gis_geometrycollection.php
2011-07-22 04:07:09 +05:30
Piotr Przybylski
b364cfd211
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-21 22:56:21 +02:00
Rouslan Placella
eed246438e
Merge branch 'master' into rte
2011-07-21 20:11:24 +01:00
Rouslan Placella
49b2ca984a
No need to show a "table" column in the list of triggers, if a table is already selected.
2011-07-21 20:07:59 +01:00
Madhura Jayaratne
e62d62fa12
Add package name
2011-07-21 21:50:55 +05:30
Madhura Jayaratne
498d53f177
Keep 1 space after the longest variable name
2011-07-21 21:45:27 +05:30
Madhura Jayaratne
de5c41d537
Line length
2011-07-21 21:44:30 +05:30
Madhura Jayaratne
96140680ee
Indicate that these methods returns nothing
2011-07-21 21:29:14 +05:30
Madhura Jayaratne
c01b63d01a
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-21 20:31:48 +05:30
Madhura Jayaratne
1e8914fe50
Avoid code duplication
2011-07-21 20:19:24 +05:30
Tyron Madlener
9f343e6ead
Merge remote-tracking branch 'origin/master'
...
Conflicts:
js/functions.js
libraries/common.lib.php
libraries/header.inc.php
server_status.php
2011-07-21 17:41:06 +03:00
Piotr Przybylski
f36b2e5441
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/db_links.inc.php
libraries/server_links.inc.php
tbl_structure.php
themes/pmahomme/css/theme_right.css.php
2011-07-21 16:21:16 +02:00
Madhura Jayaratne
338756306b
Better variable naming
2011-07-21 19:35:03 +05:30
Rouslan Placella
33df35fd6b
Merge branch 'master' into rte
2011-07-21 14:54:41 +01:00
Rouslan Placella
896519cf77
E_ALL fix
2011-07-21 14:52:30 +01:00
Michal Čihař
9730a6b3d7
Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d'
...
Conflicts:
js/functions.js
libraries/common.lib.php
libraries/header.inc.php
server_status.php
2011-07-21 15:51:05 +02:00
Michal Čihař
bb3cb6d99c
Fix docblocks
2011-07-21 15:32:40 +02:00
Michal Čihař
aa45961965
Add missing docs
2011-07-21 15:32:40 +02:00
Piotr Przybylski
a28beb9c1f
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/server_synchronize.lib.php
server_status.php
2011-07-21 15:25:52 +02:00
Marc Delisle
33627e9533
Merge commit '788fb45a1d6c70d52e8b627023bf01de34a22a4d'
2011-07-21 09:18:44 -04:00
Madhura Jayaratne
dc9312cae3
Return assigned to wrong variable
2011-07-21 18:35:53 +05:30
Madhura Jayaratne
ffa28f0f7c
Avoid variables with short names
2011-07-21 18:33:45 +05:30
Madhura Jayaratne
24b28f1017
Unused variable
2011-07-21 18:29:51 +05:30
Michal Čihař
06655a8a96
Document that functions do not return anything
2011-07-21 14:58:47 +02:00
Michal Čihař
dd641ef164
Wrap some long lines
2011-07-21 14:49:25 +02:00
Michal Čihař
85e680c396
Remove function names used as first word in docblock
2011-07-21 14:45:52 +02:00
Michal Čihař
0d2c073065
Add parameter types
2011-07-21 14:43:54 +02:00
Michal Čihař
8aa62d4931
Minor fix in coding style
2011-07-21 14:41:52 +02:00
Michal Čihař
4c16ac5d06
Missing references in doc block
2011-07-21 14:41:37 +02:00
Michal Čihař
625a35bd87
Wrap some long lines
2011-07-21 14:40:46 +02:00
Michal Čihař
7986ea8f35
Free result once we do not need it
2011-07-21 14:36:01 +02:00
Michal Čihař
dafefcd275
More replacement of double quotes
2011-07-21 14:35:43 +02:00
Michal Čihař
008b96aaec
Coding style
...
Wrap ling lines, add missing {} around for and if.
2011-07-21 14:31:50 +02:00
Michal Čihař
5330cabd37
Remove rest of custom color support
...
This seems to be stray code for it. Also adjusted documentation to
represent real return value.
2011-07-21 14:28:22 +02:00
Michal Čihař
c03c7bbc69
Better formatting for code
2011-07-21 14:25:31 +02:00
Michal Čihař
7f629c66ff
Remove method used only in single place as a function
2011-07-21 14:22:01 +02:00
Michal Čihař
b349356a83
Avoid storing table data when we don't need it
2011-07-21 14:20:11 +02:00
Michal Čihař
79af2a9374
Minimize need for escaping by using single quotes
2011-07-21 14:19:07 +02:00
Michal Čihař
73bb9302b6
Minimize need for escaping by using single quotes
2011-07-21 14:17:51 +02:00
Michal Čihař
beb73226c4
Minor fixes in coding style
2011-07-21 14:15:35 +02:00
Michal Čihař
a8d8e0c89a
Add file description
2011-07-21 14:13:24 +02:00
Michal Čihař
abc7e01cf0
Minor fixes in coding style
2011-07-21 14:12:48 +02:00
Michal Čihař
b2653bf6d0
Fix docblock spacing and add parameter names
2011-07-21 13:53:39 +02:00
Michal Čihař
3c679d0dcb
Fix indentation
2011-07-21 13:52:32 +02:00
Michal Čihař
ac0ebe3053
Fix docblock spacing and add variable names
2011-07-21 13:51:59 +02:00
Michal Čihař
9fcb84f4fb
Proper placing of documentation
2011-07-21 13:50:14 +02:00
Michal Čihař
9fb8bf6ce6
Fix indentation
2011-07-21 13:41:55 +02:00
Michal Čihař
04b9b79c1c
Fix coding style
2011-07-21 13:40:05 +02:00
Michal Čihař
64dd497a6f
Fix indentation
2011-07-21 13:39:32 +02:00
Michal Čihař
56a3f0c874
Fix function docblock
2011-07-21 13:39:04 +02:00
Michal Čihař
ab1e5a3755
Fix function docblock
2011-07-21 13:38:14 +02:00
Michal Čihař
d1c5d981e5
Add file level docblock
2011-07-21 13:37:07 +02:00
Michal Čihař
e55d178a42
This @todo does not make sense
2011-07-21 13:32:11 +02:00
Michal Čihař
b790300deb
Whitespace cleanup
2011-07-21 13:31:53 +02:00
Aris Feryanto
30dfb45619
Merge remote-tracking branch 'origin/master' into aris
2011-07-21 18:23:38 +07:00
Aris Feryanto
bc92b8449d
Merge branch 'grid' into aris
2011-07-21 18:22:56 +07:00
Aris Feryanto
44fcdaf55b
Add new feature: grid editing
2011-07-21 18:22:47 +07:00
Michal Čihař
07487b01b4
Coding style
2011-07-21 13:21:39 +02:00
Michal Čihař
a7b1a56b28
Fix indentation
2011-07-21 13:09:30 +02:00
Michal Čihař
f1c526f17a
Whitespace cleanup
2011-07-21 13:01:32 +02:00
Michal Čihař
b2173a8e4e
Localize error message
2011-07-21 13:01:23 +02:00
Michal Čihař
95465b8489
We care only about PHP 5
2011-07-21 12:03:54 +02:00
Michal Čihař
8ccc854095
Localize some more error messages.
2011-07-21 12:03:37 +02:00
Michal Čihař
0a782293e6
Proper internationalised messages
2011-07-21 11:59:47 +02:00
Michal Čihař
7a3c021e85
Add param types
2011-07-21 11:58:13 +02:00
Michal Čihař
62c2c74583
Allign comments
2011-07-21 11:54:30 +02:00
Michal Čihař
719861c8a8
Fix variable names
2011-07-21 11:53:26 +02:00
Michal Čihař
037224c85e
if and elseif coding style
2011-07-21 11:52:50 +02:00
Michal Čihař
e936ce72c5
Whitespace fixup
2011-07-21 11:51:42 +02:00
Michal Čihař
97daa89610
Remove double spaces around else
2011-07-21 11:32:52 +02:00
Michal Čihař
3650c3671f
Fix order of docs
2011-07-21 11:24:02 +02:00
Michal Čihař
48e9af42e0
Add missing space after foreach calls
2011-07-21 11:21:26 +02:00
Michal Čihař
bc0a10b831
Add missing parameter names
2011-07-21 11:19:22 +02:00
Michal Čihař
3d007a6097
Whitespace cleanup
2011-07-21 11:17:42 +02:00
Michal Čihař
b40fdde6e8
Revert "Avoid double underscore in function name"
...
This reverts commit c29c0e0eb5
2011-07-21 11:08:44 +02:00
Michal Čihař
c29c0e0eb5
Avoid double underscore in function name
2011-07-21 11:04:37 +02:00
Thilanka Kaushalya
788fb45a1d
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-21 10:01:58 +05:30
Thilanka Kaushalya
d00cf18325
Fixed bugs in convert foot notes to tooltips logic
2011-07-21 10:01:21 +05:30
Madhura Jayaratne
167d10385d
Merge branch 'QA_3_4'
2011-07-21 08:59:35 +05:30
Madhura Jayaratne
58b48a3d45
bug #3367986 [navi] Drop field -> lost active table
2011-07-21 08:55:57 +05:30
Madhura Jayaratne
6f35aaa8e4
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
libraries/import.lib.php
2011-07-20 23:15:01 +05:30
Piotr Przybylski
6dbcab261e
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
server_status.php
2011-07-20 18:23:21 +02:00
Piotr Przybylski
4ee15be986
PMA_lookForUse - require whitespace after USE
2011-07-20 18:10:38 +02:00
Piotr Przybylski
6deed1fd2e
Change NULL to null
2011-07-20 18:08:04 +02:00
Piotr Przybylski
b202936282
Unify function comments
2011-07-20 18:03:58 +02:00
Piotr Przybylski
7e27edbb6d
Hide warnings that may arise from ini_set('memory_limit', ...) and set_time_limit when used in safe_mode
2011-07-20 16:57:07 +02:00
Michal Čihař
b857e95807
Avoid using overrides for jquery CSS
...
It is better to modify the style itself instead of including another
tiny file with changes.
2011-07-20 15:20:59 +02:00
Michal Čihař
fc387fe531
Load codemirror only when needed
...
This needs verification with ajax requests.
2011-07-20 15:12:30 +02:00
Herman van Rink
9c4fd802ab
Merge remote branch 'origin/master' into unittesting
2011-07-19 22:09:28 +02:00
Thilanka Kaushalya
7c3dfb454c
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-19 23:00:12 +05:30
Thilanka Kaushalya
1c333e0a08
Fixed iid dulplication issue in footnote convertion using classes
2011-07-19 22:59:22 +05:30
Michal Čihař
dce30ddee1
Merge branch 'master' into integration
2011-07-19 14:23:11 +02:00
Michal Čihař
0eb853b250
Delete wrongly merged files
2011-07-19 14:23:04 +02:00
Michal Čihař
e2dff46f79
There is no result here
2011-07-19 13:50:57 +02:00
Piotr Przybylski
3acae146b9
Use default engine for tables created during data import
2011-07-18 23:37:14 +02:00
Piotr Przybylski
738228a8d8
Import: don't use DEFAULT CHARACTER SET in db creation (Drizzle)
2011-07-18 23:35:32 +02:00
Piotr Przybylski
08d4e5a5b8
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/export/htmlword.php
2011-07-18 22:20:33 +02:00
Tyron Madlener
5308a7b05d
Merge branch 'sprites'
...
Conflicts:
ChangeLog
po/af.po
po/az.po
po/be@latin.po
po/bs.po
po/ca.po
po/cs.po
po/el.po
po/es.po
po/fi.po
po/fr.po
po/gl.po
po/he.po
po/hi.po
po/hr.po
po/it.po
po/ka.po
po/ko.po
po/lt.po
po/lv.po
po/mk.po
po/mn.po
po/ms.po
po/nb.po
po/nl.po
po/phpmyadmin.pot
po/pl.po
po/ru.po
po/si.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/uz.po
themes/pmahomme/css/theme_right.css.php
2011-07-18 13:16:28 +03:00
Madhura Jayaratne
4d7b7d9a88
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-18 14:08:37 +05:30
Michal Čihař
1b5691656e
Use PMA_DBI_get_columns instead of own query
2011-07-18 10:27:50 +02:00
Michal Čihař
f48846cbc0
Document why eval is used
2011-07-18 10:18:31 +02:00
Michal Čihař
ba9e74bb85
Function file_get_contents is available since PHP 4.3.0, no need to check for it
2011-07-18 10:17:46 +02:00
Madhura Jayaratne
2a402a3103
OpenStreetMaps based data visualization for GIS data editor
2011-07-18 13:43:46 +05:30
Michal Čihař
6c45a67d88
Update references, remove non existing ones
2011-07-18 10:10:17 +02:00
Michal Čihař
d867d7787d
Remove commented out code
2011-07-18 10:09:03 +02:00
Michal Čihař
0d4ccd012d
Use old_offset instead of strlen
...
It is really not needed to use real data as we have the offset stored
anyway.
2011-07-18 10:06:31 +02:00
Madhura Jayaratne
5a6379f93e
SVG based data visualization for GIS data editor
2011-07-17 16:59:25 +05:30
Rouslan Placella
47f4e0772d
Better validation of parameter types when generating a CREATE ROUTINE query
2011-07-16 19:35:02 +01:00
Rouslan Placella
bdb3423bc9
Validate parameter direction when generating a CREATE PROCEDURE query
2011-07-16 19:34:17 +01:00
Rouslan Placella
d8b14b5dc7
Removed redundant whitespaces from CREATE ROUTINE query
2011-07-16 19:33:08 +01:00
Rouslan Placella
6d714e5d7d
E_ALL fix when generating CREATE ROUTINE query from empty request
2011-07-16 19:32:29 +01:00
Rouslan Placella
28881e4f4a
Simplified check for maximum number of routine parameters
2011-07-16 19:31:36 +01:00
Madhura Jayaratne
ffb970f169
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-16 02:18:41 +05:30
Rouslan Placella
62859c653e
Merge branch 'master' into rte
...
Conflicts:
libraries/rte/rte_events.lib.php
libraries/rte/rte_routines.lib.php
libraries/rte/rte_triggers.lib.php
2011-07-15 20:41:58 +01:00
Rouslan Placella
7a31e75eb6
Merge branch 'QA_3_4'
...
Conflicts:
libraries/export/codegen.php
libraries/export/xml.php
2011-07-15 16:10:24 +01:00
Rouslan Placella
40d7c3b8ba
tabs -> spaces
2011-07-15 16:02:37 +01:00
Madhura Jayaratne
56090dd46f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-15 18:35:32 +05:30
Madhura Jayaratne
c18ef53b57
Do not use PMA_mysqlDie() to handle these errors.
2011-07-15 18:30:28 +05:30
Herman van Rink
9c7d2bf9a7
Merge remote-tracking branch 'origin/master' into unittesting
2011-07-15 10:31:52 +02:00
Tyron Madlener
3b3a9fc762
pma spritify part 2
2011-07-15 09:42:16 +03:00
Piotr Przybylski
2cc22c8aba
Fix CodeGen export
2011-07-14 23:48:17 +02:00
Piotr Przybylski
70083ad583
Fix XML export so it actually can export table structure
...
More escaping fixes
2011-07-14 23:43:56 +02:00
Piotr Przybylski
65d962d397
Better escaping in XML export
...
Note: it's still incorrect
2011-07-14 23:40:58 +02:00
Piotr Przybylski
6d0f28b425
Improve readability of XML export code
2011-07-14 23:38:09 +02:00
Piotr Przybylski
a0a4628b11
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/export/latex.php
libraries/export/odt.php
libraries/export/texytext.php
libraries/export/xml.php
2011-07-14 22:38:20 +02:00
Piotr Przybylski
291e3b6a9f
Use PMA_DBI_get_columns in texytext export
2011-07-14 22:32:04 +02:00
Piotr Przybylski
bdbb888713
Use PMA_DBI_get_columns in odt export
2011-07-14 22:27:56 +02:00
Piotr Przybylski
8ff9a1bb78
Whitespace
2011-07-14 21:31:46 +02:00
Piotr Przybylski
ff7116bf7e
Fix CodeGen export
2011-07-14 21:31:45 +02:00
Piotr Przybylski
4ec9c3b09c
Use PMA_DBI_get_columns in mediawiki export
2011-07-14 21:31:45 +02:00
Piotr Przybylski
f1bcbb500a
Use PMA_DBI_get_columns in latex export
2011-07-14 21:31:45 +02:00
Piotr Przybylski
94b83dc3e9
Escape column name in PMA_DBI_get_columns_full
2011-07-14 21:31:45 +02:00
Ammar Yasir
811996e92a
Merge remote branch 'phpmyadmin/master'
2011-07-15 00:38:31 +05:30
Tyron Madlener
a5df22ced5
Merge remote-tracking branch 'origin/master'
...
Conflicts:
ChangeLog
Documentation.html
db_events.php
db_routines.php
db_structure.php
db_triggers.php
js/db_structure.js
js/functions.js
js/indexes.js
js/makegrid.js
js/messages.php
js/sql.js
js/tbl_structure.js
libraries/Table.class.php
libraries/common.lib.php
libraries/config.default.php
libraries/config/messages.inc.php
libraries/config/setup.forms.php
libraries/config/user_preferences.forms.php
libraries/database_interface.lib.php
libraries/db_events.inc.php
libraries/db_links.inc.php
libraries/display_tbl.lib.php
libraries/tbl_links.inc.php
po/af.po
po/ar.po
po/az.po
po/be.po
po/be@latin.po
po/bg.po
po/bn.po
po/br.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/et.po
po/eu.po
po/fa.po
po/fi.po
po/fr.po
po/gl.po
po/he.po
po/hi.po
po/hr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/ka.po
po/ko.po
po/lt.po
po/lv.po
po/mk.po
po/ml.po
po/mn.po
po/ms.po
po/nb.po
po/nl.po
po/phpmyadmin.pot
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/si.po
po/sk.po
po/sl.po
po/sq.po
po/sr.po
po/sr@latin.po
po/sv.po
po/ta.po
po/te.po
po/th.po
po/tr.po
po/tt.po
po/ug.po
po/uk.po
po/ur.po
po/uz.po
po/uz@latin.po
po/zh_CN.po
po/zh_TW.po
server_status.php
tbl_triggers.php
themes/original/css/theme_right.css.php
themes/original/jquery/jquery-ui-1.8.override.css
themes/pmahomme/css/theme_right.css.php
themes/pmahomme/jquery/jquery-ui-1.8.override.css
2011-07-14 17:23:35 +03:00
Madhura Jayaratne
4ee9d48346
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-14 19:49:59 +05:30
Marc Delisle
b44ece2949
Create a new is redundant
2011-07-14 09:20:34 -04:00
Rouslan Placella
526419d1a1
Renamed some functions to avoid conflicts of redefinition in unit tests
2011-07-14 13:57:05 +01:00
Tyron Madlener
bf23143424
Merge remote-tracking branch 'origin/master'
...
Conflicts:
ChangeLog
Documentation.html
db_events.php
db_routines.php
db_structure.php
db_triggers.php
js/db_structure.js
js/functions.js
js/indexes.js
js/makegrid.js
js/messages.php
js/sql.js
js/tbl_structure.js
libraries/Table.class.php
libraries/common.lib.php
libraries/config.default.php
libraries/config/messages.inc.php
libraries/config/setup.forms.php
libraries/config/user_preferences.forms.php
libraries/database_interface.lib.php
libraries/db_events.inc.php
libraries/db_links.inc.php
libraries/display_tbl.lib.php
libraries/tbl_links.inc.php
po/af.po
po/ar.po
po/az.po
po/be.po
po/be@latin.po
po/bg.po
po/bn.po
po/br.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/et.po
po/eu.po
po/fa.po
po/fi.po
po/fr.po
po/gl.po
po/he.po
po/hi.po
po/hr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/ka.po
po/ko.po
po/lt.po
po/lv.po
po/mk.po
po/ml.po
po/mn.po
po/ms.po
po/nb.po
po/nl.po
po/phpmyadmin.pot
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/si.po
po/sk.po
po/sl.po
po/sq.po
po/sr.po
po/sr@latin.po
po/sv.po
po/ta.po
po/te.po
po/th.po
po/tr.po
po/tt.po
po/ug.po
po/uk.po
po/ur.po
po/uz.po
po/uz@latin.po
po/zh_CN.po
po/zh_TW.po
server_status.php
tbl_triggers.php
themes/original/css/theme_right.css.php
themes/original/jquery/jquery-ui-1.8.override.css
themes/pmahomme/css/theme_right.css.php
themes/pmahomme/img/s_sortable.png
themes/pmahomme/jquery/jquery-ui-1.8.override.css
2011-07-14 15:56:31 +03:00
Tyron Madlener
da943ecbf7
PMA Icons to sprites part 1
2011-07-14 15:37:08 +03:00
Rouslan Placella
f989d6f0cf
Fixed handling of length/values for the return variable of functions
2011-07-14 13:06:31 +01:00
Rouslan Placella
9ca378d794
Merge branch 'rte'
2011-07-14 12:57:31 +01:00
Rouslan Placella
0e622faed6
Removed redundant code from rte_routines.lib.php
2011-07-14 12:57:09 +01:00
Madhura Jayaratne
ac4f0a10b0
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-14 10:01:41 +05:30
Madhura Jayaratne
66f73b4114
Better error handling.
2011-07-14 09:59:35 +05:30
Piotr Przybylski
ad87dcf884
Removed useless code
2011-07-14 01:48:13 +02:00
Piotr Przybylski
bce8eaf40a
JSON export plugin: fix syntax for empty table, better data escaping
2011-07-14 01:44:41 +02:00
Piotr Przybylski
059ddeb797
Better db and table name escaping in codegen and htmlword export plugins
2011-07-14 01:43:30 +02:00
Piotr Przybylski
590059cc30
Fix db/table name escaping in UI preferences
2011-07-14 01:30:25 +02:00
Piotr Przybylski
f7591dd563
Fix SQL export
2011-07-14 00:57:19 +02:00
Piotr Przybylski
151799f17f
Properly escape database name
2011-07-14 00:41:11 +02:00
Piotr Przybylski
59e71a06c0
Quick fixes for XML export
2011-07-14 00:40:15 +02:00
Piotr Przybylski
ab4cca24bc
There are no triggers in Drizzle
2011-07-14 00:40:01 +02:00
Piotr Przybylski
fb01897f61
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-14 00:30:39 +02:00
Piotr Przybylski
d84d51c775
Fix XML export so it actually can export table structure
...
More escaping fixes
2011-07-14 00:05:58 +02:00
Piotr Przybylski
667cf67954
Better escaping in XML export
...
Note: it's still incorrect
2011-07-13 23:50:22 +02:00
Piotr Przybylski
09e74a9415
Improve readability of XML export code
2011-07-13 23:40:58 +02:00
Piotr Przybylski
dd6f936731
Make PMA_DBI_get_triggers aware that Drizzle doesn't have triggers
2011-07-13 20:57:05 +02:00
Madhura Jayaratne
e0e0dea09b
1) Better error handling. 2)Typo
2011-07-14 00:09:25 +05:30
Madhura Jayaratne
1d9ef02608
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-13 23:55:14 +05:30
Madhura Jayaratne
a1e6b187c6
Correctly display error message for zero data.
2011-07-13 23:51:25 +05:30
Rouslan Placella
d3fa11c19b
Move declarations of globals into functions, so that unit tests are possible
2011-07-13 18:42:10 +01:00
Piotr Przybylski
480fe9f78c
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-13 17:37:50 +02:00
Piotr Przybylski
f57faf6b58
Removed unused code
2011-07-13 17:29:07 +02:00
Piotr Przybylski
df4c23f0c9
Comments and formatting in common.lib.php
2011-07-13 17:29:06 +02:00
Piotr Przybylski
b5d450ff31
PMA_MYSQL_INT_VERSION is at least 50015
2011-07-13 17:29:06 +02:00
Michal Čihař
ae780330e8
Add missing semicolon
2011-07-13 17:05:34 +02:00
Piotr Przybylski
beddd31ec3
Make PMA_DBI_getCompatibilities() aware of Drizzle - it doesn't have SQL_MODE
2011-07-13 17:00:42 +02:00
Piotr Przybylski
c3d1a8b14a
Ignore SkipLockedTables (Drizzle)
2011-07-13 16:59:22 +02:00
Marc Delisle
b2d8e0b60f
Clarify directive name: ShowDisplayDir -> ShowDisplayDirection
2011-07-13 09:19:38 -04:00
Piotr Przybylski
7801d55018
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-13 14:05:24 +02:00
Piotr Przybylski
e7a4453406
More code formatting changes
2011-07-13 14:02:43 +02:00
Rouslan Placella
02b32a14b5
PHP's in_array does not work on multidimential arrays
2011-07-13 12:29:02 +01:00
Piotr Przybylski
682ceb66c1
Removed SOUNDEX function (Drizzle)
...
It's never been supported, Drizzle docs are wrong
2011-07-13 12:28:23 +02:00
Piotr Przybylski
bf9469ec18
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-13 12:25:06 +02:00
Rouslan Placella
0ebd961db7
Merge branch 'rte'
2011-07-13 11:15:25 +01:00
Herman van Rink
cf8ea68f09
Merge remote-tracking branch 'origin/master' into unittesting
2011-07-13 11:58:08 +02:00
Madhura Jayaratne
f76785603f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-13 00:20:41 +05:30
Madhura Jayaratne
2bf70868bb
Avoid undefined variables
2011-07-13 00:19:11 +05:30
Madhura Jayaratne
242534a78a
Avoid divide by zero error
2011-07-13 00:17:09 +05:30
Piotr Przybylski
2c0d2aca16
Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION
2011-07-12 18:16:01 +02:00
Rouslan Placella
8aad65b494
Moved some Routine functions around to match the order of Event and Trigger functions.
2011-07-12 17:14:32 +01:00
Piotr Przybylski
ced22c9c22
Remove unused function from most export plugins: PMA_exportComment
...
It's used only locally in SQL export
2011-07-12 17:50:46 +02:00
Piotr Przybylski
f14a4e567f
Unify comments for export plugins
2011-07-12 17:50:46 +02:00
Rouslan Placella
ff7468b2cf
Merge branch 'master' into rte
2011-07-12 14:54:42 +01:00
Rouslan Placella
fed169554a
Swapped some inline styles for classes.
2011-07-12 14:52:36 +01:00
Rouslan Placella
6f0f522fcd
Do not send 'name' and 'row' data in the AJAX request, if it will not be used because the trigger will not be inserted into the list.
2011-07-12 14:38:40 +01:00
Madhura Jayaratne
be8ce3d5b6
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-12 19:04:47 +05:30
Madhura Jayaratne
7802be3c48
Avoid notices about undefined array index
2011-07-12 19:00:44 +05:30
Rouslan Placella
9898cf8609
Coding guidelines for routines.
2011-07-12 14:00:42 +01:00
Rouslan Placella
c8ec2dd8cb
Coding guidelines for triggers.
2011-07-12 12:58:23 +01:00
Rouslan Placella
4df98e9e62
Coding guidelines for code common to Routines, Triggers and Events.
2011-07-12 12:02:12 +01:00
Ammar Yasir
d5d9b38af0
Merge remote branch 'phpmyadmin/master'
2011-07-12 06:50:46 +05:30
Piotr Przybylski
b57bc2ff5d
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-11 19:41:21 +02:00
Madhura Jayaratne
b9e5125870
Correctly display null and empty values in geometry columns
2011-07-11 22:25:45 +05:30
Madhura Jayaratne
c821997a5a
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-11 21:36:38 +05:30
Madhura Jayaratne
3ca86a3929
Protection against malformed WKT and null
2011-07-11 21:29:48 +05:30
Rouslan Placella
262a27232e
Coding guidelines for events.
2011-07-11 16:00:43 +01:00
Michal Čihař
571cdc6ff4
Pass token along with swekey auth requests
2011-07-11 14:50:44 +02:00
Rouslan Placella
eb33912d8d
Merge branch 'master' into rte
2011-07-11 12:30:47 +01:00
Rouslan Placella
a4dd7561b0
SERIAL and BOOLEAN types have no length.
2011-07-11 12:28:09 +01:00
Michal Čihař
4b80c81536
Merge branch 'QA_3_4'
2011-07-10 22:47:34 +02:00
Michal Čihař
ed88c4a7b6
Fix error when gettext is not yet loaded and we want to warn.
...
This happens when PHP is compiled without session support, which is
checked before gettext is loaded.
2011-07-10 22:46:46 +02:00
Madhura Jayaratne
6f3cf75e31
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-07-10 22:26:15 +05:30
Ammar Yasir
ea171beebe
Merge remote branch 'phpmyadmin/master'
2011-07-10 08:13:46 +05:30
Herman van Rink
e7bb42c002
[security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-12
2011-07-09 23:10:23 +02:00
Piotr Przybylski
1bf994d73f
Try to cast default values for BOOLEAN columns to TRUE/FALSE
...
Required for Drizzle, adds more correct values for MySQL
2011-07-09 22:08:32 +02:00
Piotr Przybylski
024d4adc27
UUID has no length
2011-07-09 21:52:33 +02:00
Piotr Przybylski
382c020a85
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-09 21:50:23 +02:00
Piotr Przybylski
2c4c45a68d
SERIAL and BOOLEAN columns have no length
2011-07-09 21:49:07 +02:00
Madhura Jayaratne
c81db372d7
Manually implemented PointOnSurface() function as it is not yet implemented in MySQL
2011-07-09 19:18:03 +05:30
Herman van Rink
3ae58f0cd6
[security] Fixed local file inclusion vulnerability and code execution, see PMASA-2011-11
2011-07-08 21:43:38 +02:00
Piotr Przybylski
44907283fc
Merge remote-tracking branch 'origin/master' into drizzle
2011-07-08 19:50:42 +02:00
Rouslan Placella
125467978e
Removed some pointless parameters from functions that handle the editing and execution of routines
2011-07-08 16:40:59 +01:00
Rouslan Placella
283bb10c35
More comments for functions that handle Routines, Triggers and Events
2011-07-08 16:36:20 +01:00
Rouslan Placella
612d6a1ff1
Standardized all "name" attributes for input fields of the Routines, Triggers and Events editors
2011-07-08 16:05:46 +01:00
Madhura Jayaratne
a58bb10e18
Correctly import multipolygons from ESRI shape files
2011-07-08 18:32:35 +05:30
Madhura Jayaratne
28519cf25b
ESRI shape files imported from a zip archive
2011-07-08 18:31:19 +05:30
Madhura
6f4db19f53
Merge remote branch 'origin/master' into OpenGIS
2011-07-08 18:05:52 +05:30
Rouslan Placella
cae5bba400
Better filtering on generation of 'CREATE [ROUTINE|TRIGGER|EVENT]' queries.
2011-07-08 13:21:32 +01:00
Rouslan Placella
ec83a934d1
Merge branch 'master' into rte
2011-07-08 11:36:48 +01:00
Tyron Madlener
b1405cd68d
Monitor: log selection feature v0.1
2011-07-07 20:28:49 +03:00
Ammar Yasir
57dc8ce4a5
Merge remote branch 'phpmyadmin/master'
...
Conflicts:
libraries/config.default.php
tbl_select.php
2011-07-07 21:00:10 +05:30
Ammar Yasir
41715e512a
Removed mode feature, appended a missing configuration directive and changed help link duration to 10sec
2011-07-07 20:53:32 +05:30
Rouslan Placella
5a35754d0b
Reverted to fetching lists by row instead of by cell, also implemented better control over some localized strings
2011-07-07 15:27:48 +01:00
Michal Čihař
5140c38db0
Remove dead code
2011-07-07 15:59:22 +02:00
Michal Čihař
624d0db703
Better translatable title
2011-07-07 15:11:58 +02:00
Michal Čihař
90a232d8fb
Add definition for Breton
2011-07-07 13:46:15 +02:00
Rouslan Placella
dad5d3594a
Merge branch 'master' into rte
2011-07-07 12:31:53 +01:00
Piotr Przybylski
e15d5de309
Add TO_SECONDS and UUID_SHORT to MySQL function list (only for supported versions)
2011-07-06 19:31:54 +02:00
Piotr Przybylski
a445d94ee0
Function list and column types for Drizzle
2011-07-06 19:08:23 +02:00
Rouslan Placella
b3b7d45e78
Dropping useless rte_common.lib.php
2011-07-06 18:08:22 +01:00
Piotr Przybylski
ff0081bb7a
Rename pk_char36 to FUNC_UUID
2011-07-06 19:06:51 +02:00
Rouslan Placella
b03249f64a
Do not export the delimiter for triggers
2011-07-06 18:01:51 +01:00
Rouslan Placella
6490a75c4e
Fixed bug, where after deleting a table the Routines, Triggers and Events tabs stopped working.
2011-07-06 17:57:21 +01:00
Piotr Przybylski
b1b4e6389d
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/server_synchronize.lib.php
2011-07-06 18:31:38 +02:00
Piotr Przybylski
19ec26904b
Revert "Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle)"
...
This reverts commit 35843439df
2011-07-06 18:22:55 +02:00
Piotr Przybylski
66158f66c2
Move DefaultFunctions back to config.default.php
2011-07-06 17:47:07 +02:00
Piotr Przybylski
511cf978f6
Infer $cfg['Functions'] from $cfg['RestrictFunctions']
2011-07-06 17:44:18 +02:00
Piotr Przybylski
866d1da95a
Move ColumnTypes, AttributeTypes, Functions, RestrictColumnTypes, RestrictFunctions and DefaultFunctions to a separate file
2011-07-06 17:29:33 +02:00
Piotr Przybylski
87a539aea7
Remove *Operators configuration variables
2011-07-06 17:00:33 +02:00
Piotr Przybylski
c9df5b2733
Removed unused variables
2011-07-06 16:34:10 +02:00
Rouslan Placella
ccd1cc3f9e
Simplified code for 'export' functionality of Routines, Triggers and Events
2011-07-06 14:29:46 +01:00
Rouslan Placella
d1f0b34ab5
Merge branch 'master' into rte
2011-07-06 14:18:36 +01:00
Herman van Rink
f81c001f76
Merge remote-tracking branch 'zarubin/master' into unittesting
2011-07-06 11:03:46 +02:00
Herman van Rink
60a2e5b3f3
Merge branch 'master' into unittesting
2011-07-06 10:30:43 +02:00
Zarubin Stas
91709ec0c1
New PHPUnit tests for common.lib.php
2011-07-06 10:47:10 +03:00
Tyron Madlener
2ee9f03cbb
Merge remote-tracking branch 'origin/master' into tyronm
2011-07-05 18:09:55 +02:00
Rouslan Placella
d47e01e7ef
Tabs -> Spaces
2011-07-05 16:06:37 +01:00
Rouslan Placella
7857a05de3
Removed pointless constant 'ITEM'
2011-07-05 16:04:08 +01:00
Rouslan Placella
9c11b373fb
Added '---' to otherwise empty table cells in the routines editor.
2011-07-05 15:45:43 +01:00
Rouslan Placella
8e8a5e54f0
Bolded the labels in the editor for Routines, Triggers and Events
2011-07-05 14:48:40 +01:00
Herman van Rink
39cb55a0de
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-05 14:46:24 +02:00
Herman van Rink
82f83dac2f
Fixed XSS in unreleased RecentTable class
2011-07-05 14:46:13 +02:00
Rouslan Placella
357d84e52f
Merge branch 'master' into rte
...
Conflicts:
js/db_routines.js
2011-07-05 13:13:31 +01:00
Rouslan Placella
70c70db139
Fix for bug #3353856 - AJAX dialogs use wrong font-size
2011-07-05 13:03:08 +01:00
Rouslan Placella
e947712358
Do not insert not preserved events from the past into the list of events. Also use same logic for other items.
2011-07-05 12:53:49 +01:00
Rouslan Placella
15ad6605b1
Set 'maxlength' of input fields in HTML, instead of validating against a maximum length in JS.
2011-07-05 11:38:46 +01:00
Rouslan Placella
55d2358359
Factored out the JS for the editor of Routines, Triggers and Events and moved it into a namespace.
2011-07-05 11:30:22 +01:00
Herman van Rink
cf5d62b7ca
Code style
2011-07-05 08:35:15 +02:00
Ammar Yasir
03a1a84b78
Test
2011-07-05 05:21:16 +05:30
Ammar Yasir
78f93fdd3c
Merge remote branch 'phpmyadmin/master'
2011-07-04 21:58:47 +05:30
Rouslan Placella
1bbb2ea37e
Merge branch 'master' into rte
2011-07-04 15:36:27 +01:00
Tyron Madlener
cdffaf3115
Small adjustments and linux cpu usage fixed
2011-07-04 11:33:11 +02:00
Zarubin Stas
7087e74c63
Merge remote-tracking branch 'upstream/master'
2011-07-04 04:02:38 +03:00
Madhura Jayaratne
c6a8098239
Typo
2011-07-04 00:31:24 +05:30
Madhura Jayaratne
5a1018fc43
Increase memory limit and time limit
2011-07-03 23:56:47 +05:30
Madhura Jayaratne
4d111205b1
A polygon needs to have atleast 4 points - more instances
2011-07-03 22:46:48 +05:30
Madhura Jayaratne
93ab68dd13
A polygon needs to have atleast 4 points - more instances
2011-07-03 22:41:52 +05:30
Madhura Jayaratne
ae88c2e758
Tabs replaced with spaces
2011-07-03 22:14:14 +05:30
Madhura Jayaratne
c4faafdc79
Import GIS data from ESRI shape files
2011-07-03 22:12:02 +05:30
Madhura Jayaratne
1bc0473fe2
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
tbl_replace.php
2011-07-03 21:42:04 +05:30
Marc Delisle
3c0853dc68
Merge commit '61ea5e765db6c9382ef8fba9ab27737664b2d6cc'
2011-07-03 07:29:03 -04:00
Piotr Przybylski
cfdf3aa7c3
Whitespace cleanup
...
Removed @uses and fixed broken PHPDoc comments
2011-07-03 13:21:13 +02:00
Thilanka Kaushalya
56883ec0c5
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-03 10:52:56 +05:30
Marc Delisle
12fcc270f2
Merge branch 'QA_3_4'
2011-07-02 20:52:10 -04:00
Marc Delisle
58d86350c4
Merge branch 'MAINT_3_4_3' into QA_3_4
2011-07-02 20:49:29 -04:00
Marc Delisle
e214683f9f
3.4.3.1 release
2011-07-02 20:49:01 -04:00
Piotr Przybylski
9ba2650bc6
Don't offer FULLTEXT in table creation form (Drizzle)
2011-07-03 01:48:32 +02:00
Piotr Przybylski
35843439df
Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle)
2011-07-03 01:47:03 +02:00
Piotr Przybylski
0266ddd7bd
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/database_interface.lib.php
2011-07-03 00:41:31 +02:00
Thilanka Kaushalya
232b2a72c6
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-07-02 15:19:45 +05:30
Madhura Jayaratne
a45a11f4e8
Merge branch 'QA_3_4'
2011-07-02 07:12:39 +05:30
Madhura Jayaratne
5217946601
bug #3340151 [export] Working SQL query exports error page
2011-07-02 07:05:54 +05:30
Piotr Przybylski
6d88345404
Remove DBI from moved functions' names
2011-07-02 00:48:14 +02:00
Piotr Przybylski
e6b1d479cf
Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php
...
They are used only there, no need to parse 1,5 KB of code on every page load
2011-07-02 00:45:08 +02:00
Piotr Przybylski
5021bae02f
Remove unused PMA_DBI_get_table_data
2011-07-02 00:34:25 +02:00
Piotr Przybylski
b232941976
Whitespace and comments
2011-07-02 00:30:09 +02:00
Zarubin Stas
e31ee99f7e
Merge remote-tracking branch 'upstream/master'
2011-07-01 22:39:49 +03:00
Piotr Przybylski
da63d2cb13
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
libraries/database_interface.lib.php
2011-07-01 20:52:25 +02:00
Piotr Przybylski
d5dd8a2d37
Fix PMA_DBI_get_columns
2011-07-01 20:37:58 +02:00
Piotr Przybylski
a28d43abf3
Updated MySQL function list
2011-07-01 20:37:57 +02:00
Piotr Przybylski
56d4b081a0
Remove STDDEV_* and VAR_*
...
Standard deviation and variance make no sense when called with one argument
2011-07-01 20:37:56 +02:00
Thilanka Kaushalya
d33590a544
Resolved conflicts
2011-07-01 23:50:58 +05:30
Thilanka Kaushalya
0cb77d14ba
Ajaxify Index edit in table structure
2011-07-01 23:39:23 +05:30
Madhura Jayaratne
9fde1b5b23
Merge branch 'QA_3_4'
2011-07-01 23:00:57 +05:30
Madhura Jayaratne
4d1540cc1c
bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
2011-07-01 22:58:35 +05:30
Rouslan Placella
79e7544c3d
Merge branch 'master' into rte
...
Conflicts:
db_routines.php
libraries/database_interface.lib.php
libraries/db_events.inc.php
libraries/rte/rte_routines.lib.php
2011-07-01 16:51:42 +01:00
Rouslan Placella
8c13805344
Prototype imlementation of the events editor
2011-07-01 16:46:17 +01:00
Rouslan Placella
58d97f87ee
Fix broken trigger links after edit operation
2011-07-01 16:45:03 +01:00
Tyron Madlener
89d7c85087
more fixes
2011-07-01 14:28:38 +02:00
Tyron Madlener
29f73bf0f0
Monitor (abusing demo server for debugging :D):
...
- Fix for cached mem, cpu load under linux
- Linux memory and swap are stacked
2011-07-01 12:52:55 +02:00
Ammar Yasir
2a4c47c0a2
Merge remote branch 'phpmyadmin/master'
...
Conflicts:
tbl_select.php
2011-07-01 15:34:39 +05:30
Ammar Yasir
543df4c802
Added interface for browsing/editing points
2011-07-01 15:31:56 +05:30
Tyron Madlener
31ea2ca2c8
CPU, Memory and SWAP Usage charts for Windows and Linux
2011-07-01 10:55:52 +02:00
Aris Feryanto
c4ee218fb5
Navigation bar: more compact, display horizontal/vertical mode only when configured
2011-07-01 11:31:30 +08:00
Herman van Rink
b434320eff
Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8
2011-06-30 20:26:08 +02:00
Rouslan Placella
d7c0da5f85
Missing semicolon breaks formatting of the pretty printer
2011-06-30 18:27:40 +01:00
Rouslan Placella
31e03fc640
Order the list of events by name
2011-06-30 18:22:23 +01:00
Piotr Przybylski
e3a4f6d95a
Fix PMA_DBI_get_columns when $column parameter is used and UNI key is promoted to PRI
2011-06-30 18:54:45 +02:00
Piotr Przybylski
29070219a9
Fix comments
2011-06-30 16:41:48 +02:00
Rouslan Placella
c150eb0c7c
Integrate PMA_toggleButton() with $cfg['AjaxEnable']
2011-06-30 13:19:31 +01:00
Rouslan Placella
cf61fb1270
Prototype integration of Triggers editor.
2011-06-30 13:12:26 +01:00
Herman van Rink
69fb0f8e7d
Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7
2011-06-30 13:26:29 +02:00
Rouslan Placella
b4b56ed461
Merge branch 'master' into rte
...
Conflicts:
db_routines.php
libraries/db_events.inc.php
libraries/rte/rte_routines.lib.php
2011-06-30 11:42:16 +01:00
Herman van Rink
7ebd958b2b
Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
2011-06-30 12:30:58 +02:00
Aris Feryanto
f0c322cbdd
Modify the navigation bar to provide more intuitive UI
2011-06-30 13:15:13 +08:00
Madhura Jayaratne
b8ddd56d78
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-30 10:01:33 +05:30
Madhura Jayaratne
67ef96d1f6
Check whether the variable is set before accessing it.
2011-06-30 09:58:09 +05:30
Piotr Przybylski
7ef98dc9a2
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-30 00:52:01 +02:00
Piotr Przybylski
cbf00bca6c
Remove unused variables
2011-06-30 00:50:42 +02:00
Piotr Przybylski
00946276e7
Fix column ordering when query has LIMIT, PROCEDURE, FOR UPDATE or LOCK IN SHARE MODE and contains newline
2011-06-30 00:50:41 +02:00
Piotr Przybylski
7255ec2100
Change PMA_DBI_get_columns() to always return complex descriptions, never simple column list (it was needed for one case anyway)
...
Bugfixes
2011-06-30 00:48:19 +02:00
Zarubin Stas
f7d7102d2f
- Unit Test grouped by library directory
...
- Added configuration file phpunit.xml.dist and bootstraper-dist.php
- Ignoring phpunit.xml, bootstraper.php and build/
2011-06-29 20:06:27 +03:00
Aris Feryanto
24150ce3a9
Merge remote-tracking branch 'origin/master' into aris
2011-06-29 10:28:00 +08:00
Piotr Przybylski
04fef01fd7
Properly compute 'Extra' in PMA_DBI_get_columns_sql (Drizzle)
2011-06-28 23:34:01 +02:00
Piotr Przybylski
96c5c6dbc6
Add $column parameter to PMA_DBI_get_columns
2011-06-28 23:11:58 +02:00
Piotr Przybylski
eb8caa4b77
Removed dead and incorrect code
...
(In static context $this makes no sense)
2011-06-28 22:42:04 +02:00
Piotr Przybylski
2a8dee495a
Fix/unify comments
2011-06-28 22:42:04 +02:00
Piotr Przybylski
02fef2c5af
Proper check for TIMESTAMP
2011-06-28 22:42:03 +02:00
Rouslan Placella
cbafdb9a1f
Refactored some routine, trigger and event manipulation code
2011-06-28 17:11:53 +01:00
Aris Feryanto
14ffb9ae84
Merge branch 'hidecol' into aris
2011-06-28 09:57:25 +08:00
Aris Feryanto
60a0334661
Fix merge conflict with origin/master
2011-06-28 09:50:54 +08:00
Aris Feryanto
c7892cf5bb
Change to and some code fix
2011-06-28 09:42:26 +08:00
Piotr Przybylski
83117b18d7
Use PMA_sqlAddSlashes from recent merge
2011-06-27 23:59:04 +02:00
Piotr Przybylski
3bde595666
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-27 23:55:32 +02:00
Michal Čihař
12348ee826
Fix escaping on LIKE queries
...
All these need special variant of PMA_sqlAddSlashes.
2011-06-27 14:50:16 +02:00
Michal Čihař
c9c9fdf49d
Consistent capitalisation of PMA_sqlAddSlashes
2011-06-27 14:48:15 +02:00
Michal Čihař
6a422caf52
Proper escaping while checking for table (bug#3323066)
2011-06-27 14:46:04 +02:00
Michal Čihař
78ee628312
Use cache to skip blobstreaming check if server does not support it
2011-06-27 14:35:34 +02:00
Marc Delisle
e21d6073e4
3.4.3 release
2011-06-27 08:20:21 -04:00
Rouslan Placella
ef3a45b596
Merge branch 'master' into rte
...
Conflicts:
libraries/db_events.inc.php
libraries/display_triggers.inc.php
2011-06-27 11:27:21 +01:00
Michal Čihař
a01662dd4a
Revemo empty @license tags
2011-06-27 11:22:10 +02:00
Michal Čihař
4af40a31d5
Remove empty @copyright tags
2011-06-27 11:21:54 +02:00
Michal Čihař
e57f27e50b
Remove @uses tags from docblocks
2011-06-27 11:20:20 +02:00
Aris Feryanto
22ff715452
Merge branch 'hidecol' into aris
2011-06-27 12:10:51 +08:00
Aris Feryanto
ba4515212a
Remove 'too many' <th> when browsing table with vertical mode and repeat headers = small value
2011-06-27 12:10:04 +08:00
Aris Feryanto
4932550801
Show/hide column: remove hide button, add column visibility hint, and some prettification
2011-06-27 11:53:57 +08:00
Piotr Przybylski
c734e1fd14
Workaround for brokwn ROW_FORMAT in SHOW CREATE TABLE (Drizzle)
2011-06-26 21:26:49 +02:00
Piotr Przybylski
28ae930a71
sql_mode doesn't exist in Drizzle
2011-06-26 21:25:24 +02:00
Piotr Przybylski
14ab81248c
Don't offer MyISAM engine in Drizzle
...
It can be used only for temporary tables
2011-06-26 20:46:30 +02:00
Piotr Przybylski
b00eb8f29c
Show storage engine list in db/table operations (Drizzle)
2011-06-26 20:10:49 +02:00
Piotr Przybylski
3eaff6afb6
A few Drizzle-related changes to db operations tab
2011-06-26 18:38:36 +02:00
Piotr Przybylski
6553cdd663
Add information about query errors to debug output
2011-06-26 18:37:24 +02:00
Piotr Przybylski
d4d647e169
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-26 18:32:20 +02:00
Piotr Przybylski
3c55511e5c
Use Create_time instead of CREATE_TIME
2011-06-26 18:28:35 +02:00
Marc Delisle
7322e858f0
Incorrect comment for return param
2011-06-26 09:05:19 -04:00
Madhura Jayaratne
52501828f7
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-26 18:01:41 +05:30
Madhura Jayaratne
ff3efd4b7d
Editing geometry data using GIS data editor.
2011-06-26 17:57:12 +05:30
Marc Delisle
a04169f97d
"Add a new" is redundant"
2011-06-26 07:33:09 -04:00
Madhura Jayaratne
5ac3f567c4
GIS data editing for POINT
2011-06-25 23:01:48 +05:30
Madhura Jayaratne
d257d46dee
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-25 19:48:40 +05:30
Madhura Jayaratne
63900d0094
GIS data editor for environments without JavaScript support.
...
GIS data preserved while editing.
2011-06-25 19:39:31 +05:30
Piotr Przybylski
7d99d57cca
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-25 01:00:00 +02:00
Rouslan Placella
3b1edd95e6
Renamed db_events.inc.php to db_events.lib.php
2011-06-24 13:52:33 +01:00
Rouslan Placella
75fd7df711
Merge branch 'master' into rte
2011-06-24 13:49:55 +01:00
Rouslan Placella
4da8d2e98f
Added legend to bottom fieldset in the routines page
2011-06-24 13:45:18 +01:00
Rouslan Placella
8c15a1d25c
Imporved event functionality code and moved it into functions
2011-06-24 13:44:24 +01:00
Rouslan Placella
eef43b22b2
More MySQL documentation links for routines and triggers
2011-06-24 13:39:19 +01:00
Aris Feryanto
cab875f3df
Merge branch 'hidecol' into aris
2011-06-24 18:20:31 +08:00
Aris Feryanto
66cb04ead5
Add new feature: show/hide column(s) while browsing a table
2011-06-24 18:18:43 +08:00
Piotr Przybylski
d5eba48036
Remove unused PMA_STR_rPos, add PMA_strtolower
2011-06-23 23:28:06 +02:00
Piotr Przybylski
2399c8a784
Remove PMA_MULTIBYTE_ENCODING constant
2011-06-23 23:28:05 +02:00
Piotr Przybylski
b0496eb204
Fix comments
2011-06-23 23:28:05 +02:00
Rouslan Placella
5bafd840b7
Hide Events and Triggers navigation links from unprivileged users
2011-06-23 14:58:48 +01:00
Rouslan Placella
67c5b63a4a
Merge branch 'master' into rte
2011-06-23 14:10:19 +01:00
Piotr Przybylski
e38b5cd4ff
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
db_structure.php
libraries/common.lib.php
libraries/database_interface.lib.php
tbl_structure.php
2011-06-23 14:02:58 +02:00
Marc Delisle
929cb3d63f
Typo
2011-06-23 06:33:39 -04:00
Marc Delisle
c911e891a1
Typo
2011-06-23 06:32:09 -04:00
Piotr Przybylski
5661c3e14c
Don't offer PERFORMANCE_SCHEMA engine in table creation dialog and Operations tab
2011-06-23 00:49:01 +02:00
Piotr Przybylski
3b0f465ba9
Fix StorageEngine::getStorageEngines() so it can properly cache data
2011-06-23 00:44:42 +02:00
Rouslan Placella
4f4efd231d
Better "event scheduler" functionality
2011-06-22 18:27:32 +01:00
Rouslan Placella
4cbef2bdf6
Uncommented hidden navigation links
2011-06-22 14:31:09 +01:00
Michal Čihař
4aa470e27e
Indentation fixes
2011-06-22 11:03:38 +02:00
Michal Čihař
e0c7147806
This is a fatal error rather than place for warning
...
It is not necessary to translate as this really should not happen.
2011-06-22 11:02:15 +02:00
Michal Čihař
568a0e03de
Show mcrypt waring only on main page and not on every page
2011-06-22 11:00:45 +02:00
Michal Čihař
3d74915b4e
Better messages for event scheduler disabling/enabling
2011-06-22 10:25:50 +02:00
Michal Čihař
ee0b2fee37
Better error message when config file can not be parsed
...
- shorter text
- directly show errors in iframe instead saying user to load other page
2011-06-22 09:29:14 +02:00
Michal Čihař
ae8935acf3
Remove some useless doctags
2011-06-22 08:58:18 +02:00
Michal Čihař
b22e456636
Use language name rather than adverb
2011-06-22 08:37:59 +02:00
Michal Čihař
42d93e5a8c
Add definition for Breton
2011-06-22 08:35:36 +02:00
Rouslan Placella
1f54fa2f16
Merge branch 'QA_3_4'
2011-06-21 20:39:53 +01:00
Rouslan Placella
9e224184d7
Fixed bug #3323101 - Invalid escape sequence in SQL parser
2011-06-21 20:38:42 +01:00
Rouslan Placella
c2dd99965d
Fixed bug #3323060 - SQL parser breaks AJAX requests if query has unclosed quotes
2011-06-21 20:33:32 +01:00
Michal Čihař
c6ec73963f
Use PMA_sqlAddSlashes for database queries instead of addslashes.
...
Should fix bug#3323066
2011-06-21 17:41:47 +02:00
Tyron Madlener
3e4744df45
- Removes horizontal row hover js code, as this is already working with the CSS :hover alone
...
- Working checkbox selection for vertical display mode
2011-06-21 15:05:21 +02:00
Michal Čihař
18527251e7
Fix syntax error
2011-06-21 15:03:26 +02:00
Michal Čihař
93edca9c24
Update Blowfish to latest version available from Horde.
...
This basically just improves documentation, defines public/private
methods and simplifies some code using new PHP features.
The Horde itself is no longer using this, they switched to PEAR package
Crypt_Blowfish, maybe we should do it as well?
2011-06-21 14:49:04 +02:00
Marc Delisle
723e51dfdb
Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f'
2011-06-21 08:13:41 -04:00
Michal Čihař
ffc01b199a
Define subpackages for import modules
2011-06-21 11:41:05 +02:00
Michal Čihař
76d4046858
Use subpackages for export formats
2011-06-21 11:39:21 +02:00
Michal Čihař
40ddb5031e
Docblocks and whitespace cleanup in export modules
2011-06-21 11:31:42 +02:00
Aris Feryanto
ede177c577
Merge branch 'recent' into aris
2011-06-21 12:37:59 +07:00
Aris Feryanto
238ceb8f98
Merge branch 'colresize' into aris
2011-06-21 12:37:55 +07:00
Aris Feryanto
c5d1aae6f6
Column reordering: better placement of code for displaying remembered column order
2011-06-21 12:37:20 +07:00
Aris Feryanto
24a257ffce
Column reordering: add checking for different server
2011-06-21 12:25:31 +07:00
Aris Feryanto
21b84f5c88
Recent tables: better checking of different server
2011-06-21 11:43:44 +07:00
Aris Feryanto
6e65d3d7fc
Fix bug: Recent tables list doesn't honor current server
2011-06-21 10:54:48 +07:00
Madhura Jayaratne
b261436a03
Merge remote branch 'remotes/madhura/master'
...
Conflicts:
themes/original/css/theme_right.css.php
themes/pmahomme/css/theme_right.css.php
2011-06-21 07:33:40 +05:30
Ammar Yasir
fb8a4956a8
Merge remote branch 'phpmyadmin/master'
2011-06-21 04:35:24 +05:30
Rouslan Placella
d9304efed4
Merge remote-tracking branch 'origin/master'
2011-06-20 23:16:27 +01:00
Rouslan Placella
387cb5c1fe
Temporarily hiding links to unfinished implementations of Triggers and Events functionalities
2011-06-20 23:16:12 +01:00
Marc Delisle
cf3930d29f
Complete the code change for form renaming (rowsDeleteForm to resultsForm)
2011-06-20 16:25:11 -04:00
Rouslan Placella
61329e5c87
Merge branch 'master' into rte
2011-06-20 18:26:50 +01:00
Marc Delisle
7ecb1abaa4
3.4.4-dev
2011-06-20 12:21:11 -04:00
Marc Delisle
a8caf74fda
3.4.3-rc1
2011-06-20 12:18:57 -04:00
Marc Delisle
3cb56a2b9e
Merge commit 'c450d876a6ed77cf52709db1a4b29ed8b1a97a29'
2011-06-20 08:04:45 -04:00
Rouslan Placella
0ae0593901
Fixed incorrect escaping of some query parameters
2011-06-20 12:50:29 +01:00
Rouslan Placella
223832b68d
E_ALL fix in PMA_currentUserHasPrivilege()
2011-06-20 11:33:06 +01:00
Rouslan Placella
db6ae660cf
Removed duplicate function PMA_getSupportedCharsets() that was added by mistake into the routines functionality.
2011-06-20 10:44:37 +01:00
Aris Feryanto
7e5fddf4ae
Recent table: Add support for browser without javascript
2011-06-20 13:21:07 +07:00
Piotr Przybylski
3aaaf33afa
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-19 23:35:08 +02:00
Piotr Przybylski
18513b3e5d
Fix comments
2011-06-19 23:34:02 +02:00
Piotr Przybylski
04dd50ac5d
Properly escape names in PMA_isView
2011-06-19 23:34:01 +02:00
Piotr Przybylski
a7ba0fd74a
Extract server type detection from main.php and make it available in common.lib.php
2011-06-19 23:15:54 +02:00
Piotr Przybylski
c2b06f0a11
Don't use OPTIMIZE TABLE and REPAIR TABLE with Drizzle
2011-06-19 21:10:42 +02:00
Thilanka Kaushalya
8604ba0303
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2011-06-18 22:38:44 +05:30
Thilanka Kaushalya
a8f258cb8d
Added ajax dialog for table row change
2011-06-18 22:36:54 +05:30
Piotr Przybylski
2e01d01b32
Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function
2011-06-18 00:15:43 +02:00
Piotr Przybylski
2444ad6d20
Merge remote-tracking branch 'origin/master' into drizzle
2011-06-18 00:12:43 +02:00
Piotr Przybylski
4c1cd51508
Display consistent information on table index's 'Null' field: 'Yes'/'No' instead of MySQL version dependent
2011-06-18 00:03:27 +02:00
Piotr Przybylski
89e422c1fd
Don't show 0 if index cardinality is unknown
2011-06-17 23:55:25 +02:00
Piotr Przybylski
4273c602c8
Bugfix for new PMA_DBI_get_columns
2011-06-17 21:25:13 +02:00
Piotr Przybylski
30b85be0a2
Allow for null values in PMA_DBI_get_tables_full
2011-06-17 21:03:02 +02:00
Piotr Przybylski
ae42913629
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
server_status.php
2011-06-17 20:41:42 +02:00
Piotr Przybylski
693da24c95
[Drizzle] Don't show "Create view" button for query results
2011-06-17 19:26:50 +02:00
Madhura Jayaratne
4eda17f6e3
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-17 22:37:20 +05:30
Rouslan Placella
a0504f47d6
Merge branch 'master' into rte
2011-06-17 17:12:36 +01:00
Rouslan Placella
71abc9f8d0
Fixed bug where the information about the return variable of a routine was not correctly loaded into the editor.
2011-06-17 17:08:42 +01:00
Michal Čihař
2cae746cc1
Generally we speak only about sTheme, so do not introduce / Style
2011-06-17 14:58:13 +02:00
Rouslan Placella
8410e8e520
Fixed casing of messages in routines functionality
2011-06-17 13:56:10 +01:00
Madhura Jayaratne
ef17d6e9f6
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-17 18:17:14 +05:30
Rouslan Placella
c2fb87aff5
Expand the routine editor to use all available space.
2011-06-17 13:44:14 +01:00
Michal Čihař
75f916fd3c
Merge remote-tracking branch 'tyron/master'
...
Conflicts:
server_status.php
2011-06-17 09:11:36 +02:00
Madhura Jayaratne
2b6f807b61
Add borders
2011-06-17 07:28:24 +05:30
Piotr Przybylski
12f70e8938
Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
...
Fix PMA_DBI_get_columns() in Drizzle when $full == false
2011-06-17 00:22:25 +02:00
Ammar Yasir
9498f5d4cd
Merge remote branch 'phpmyadmin/master'
2011-06-17 01:06:38 +05:30
Rouslan Placella
a8f8d3e7a8
Animate the insertion of new routines into the list
2011-06-16 11:44:06 +01:00
Madhura Jayaratne
3c28961b9f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
themes/original/css/theme_right.css.php
themes/pmahomme/css/theme_right.css.php
2011-06-16 08:52:31 +05:30
Madhura Jayaratne
7a232336f7
Better doc comments
2011-06-16 08:39:23 +05:30
Madhura Jayaratne
92f4d21456
OpenStreetMaps now zoom correctly.
2011-06-16 08:17:16 +05:30
Tyron Madlener
6f4b0f88d2
- Server variables that represent bytes are convert to a byte format (e.g. 16 EiB instead of 18,446,744,073,709,551,616)
...
- A javascript code snippet that cuts off long strings (such as the optimizer_switch variable) so the whole table stays in view without scrolling.
2011-06-15 20:36:58 +02:00
Piotr Przybylski
17f8e16141
Merge remote-tracking branch 'origin/master' into drizzle
...
Conflicts:
server_processlist.php
2011-06-15 15:38:04 +02:00
Rouslan Placella
4047020d78
Refactored code that generated the dropdown list of MySQL functions.
2011-06-15 12:45:50 +01:00
Rouslan Placella
2cd59139ec
Marged table headers in lists of Routines, Triggers and Events.
2011-06-15 11:28:56 +01:00
Madhura Jayaratne
6c79283e17
New panning arrows and zooming controls to match OSMs.
2011-06-15 07:04:24 +05:30
Aris Feryanto
b3faf9cf42
Merge branch 'tablesort' into aris
2011-06-15 07:23:37 +07:00
Aris Feryanto
ff5e4c8361
Merge branch 'colresize' into aris
2011-06-15 07:23:32 +07:00
Aris Feryanto
d28d7daba1
Fix merge conflict with origin/master
2011-06-15 07:23:06 +07:00
Aris Feryanto
5bf8536831
Fix bug in 'Remember Sorting': modified caused error in PHP
2011-06-15 07:10:16 +07:00
Rouslan Placella
dda7ce9c39
Merge branch 'master' into rte
2011-06-14 19:44:09 +01:00
Aris Feryanto
c1f6904eba
Change PMA_isBrowsing to PMA_isSelect
2011-06-14 23:11:15 +07:00
Aris Feryanto
3750dcbb2f
Column resizing & reordering: better support without javascript
2011-06-14 22:47:19 +07:00
Rouslan Placella
58c4ab431f
Fixed bug where with JS disabled sql.php did not redirect the user back to list of routines after a DROP operation.
2011-06-14 15:51:25 +01:00
Rouslan Placella
cde93fe949
Refactored code that generates parameter rows for the Routine Editor.
2011-06-14 15:24:40 +01:00
Rouslan Placella
31b42160d8
Moved all arbitrary code from routines.inc.php and renamed this file to routines.lib.php
2011-06-14 15:00:02 +01:00
Rouslan Placella
1c019d785f
Renamed Routine functions to more meaningful names.
2011-06-14 14:29:01 +01:00
Madhura Jayaratne
db06c5a912
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-06-14 18:52:52 +05:30
