Commit Graph

5112 Commits

Author SHA1 Message Date
Michal Čihař
624d0db703 Better translatable title 2011-07-07 15:11:58 +02: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
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
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
70c70db139 Fix for bug #3353856 - AJAX dialogs use wrong font-size 2011-07-05 13:03:08 +01:00
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
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
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
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
Herman van Rink
69fb0f8e7d Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 2011-06-30 13:26:29 +02: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
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
Aris Feryanto
24150ce3a9 Merge remote-tracking branch 'origin/master' into aris 2011-06-29 10:28:00 +08: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
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
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
Michal Čihař
a01662dd4a Revemo empty @license tags 2011-06-27 11:22:10 +02:00