Marc Delisle
|
723e51dfdb
|
Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f'
|
2011-06-21 08:13:41 -04:00 |
|
Michal Čihař
|
103aed54d9
|
Merge remote-tracking branch 'origin/QA_3_4'
|
2011-06-21 12:10:29 +02:00 |
|
Michal Čihař
|
341dc1296f
|
Merge branch 'MAINT_3_4_3' into QA_3_4
|
2011-06-21 12:08:54 +02:00 |
|
Michal Čihař
|
dc6c1e8b5c
|
I think htmlspecialchars should be used here
|
2011-06-21 12:08:48 +02:00 |
|
Michal Čihař
|
3336bf3636
|
Merge branch 'MAINT_3_4_3' into QA_3_4
|
2011-06-21 12:05:16 +02:00 |
|
Michal Čihař
|
cb043f4365
|
Use standard infrastructure for generating links, this also prevents XSS
|
2011-06-21 12:04:52 +02: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ř
|
4bbdebe22e
|
Add phpdoc
|
2011-06-21 11:34:06 +02:00 |
|
Michal Čihař
|
40ddb5031e
|
Docblocks and whitespace cleanup in export modules
|
2011-06-21 11:31:42 +02:00 |
|
Michal Čihař
|
657e492a22
|
Update po files to include new strings
|
2011-06-21 09:17:04 +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
|
f0b097d646
|
ChangeLog entries for commits related to OpenGIS support for phpMyAdmin
|
2011-06-21 08:22:49 +05:30 |
|
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 |
|
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 |
|
Rouslan Placella
|
a5408b248b
|
Updated the changeLog - Improved support for routines
|
2011-06-20 23:11:48 +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
|
6a5ea0a219
|
3.4.4-dev
|
2011-06-20 12:21:49 -04: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
|
b3dd0a8dd2
|
Merge from QA_3_4
|
2011-06-20 10:19:33 -04:00 |
|
Marc Delisle
|
6944ee44ce
|
ChangeLog entry for "Minor XSS"
|
2011-06-20 10:15:08 -04:00 |
|
Marc Delisle
|
3bd3f60b28
|
Merge commit '7602e1593c1565b4dbd90df13fd162cee6546798' into QA_3_4
|
2011-06-20 10:12:52 -04:00 |
|
Marc Delisle
|
e252eeb1fc
|
ChangeLog Entry for AJAX feature
|
2011-06-20 08:07:34 -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
|
ae55e9b8f8
|
Removed unnecessary AJAX messages from the routines functionalities.
|
2011-06-20 11:40:23 +01:00 |
|
Rouslan Placella
|
223832b68d
|
E_ALL fix in PMA_currentUserHasPrivilege()
|
2011-06-20 11:33:06 +01:00 |
|
Rouslan Placella
|
3829f2280f
|
More error handling for routine functionalities
|
2011-06-20 11:32:07 +01:00 |
|
Michal Čihař
|
aa83986a29
|
Merge remote-tracking branch 'tyron/master'
|
2011-06-20 11:50:06 +02:00 |
|
Michal Čihař
|
0047da1b67
|
Merge remote-tracking branch 'origin/QA_3_4'
|
2011-06-20 11:44:51 +02: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 |
|
Michal Čihař
|
6616a6b34c
|
Changes from master
|
2011-06-20 11:28:05 +02:00 |
|
Panagiotis Papazoglou
|
1f226191cd
|
Translation update done using Pootle.
|
2011-06-20 11:01:34 +02:00 |
|
Panagiotis Papazoglou
|
9f4e24a8d5
|
Translation update done using Pootle.
|
2011-06-20 11:01:27 +02:00 |
|
Panagiotis Papazoglou
|
a9c29ebef7
|
Translation update done using Pootle.
|
2011-06-20 11:01:03 +02:00 |
|
Panagiotis Papazoglou
|
7dd687e6ad
|
Translation update done using Pootle.
|
2011-06-20 11:00:49 +02:00 |
|
Panagiotis Papazoglou
|
a90197ab6c
|
Translation update done using Pootle.
|
2011-06-20 11:00:37 +02:00 |
|
Panagiotis Papazoglou
|
2675db2f52
|
Translation update done using Pootle.
|
2011-06-20 11:00:09 +02:00 |
|
Panagiotis Papazoglou
|
e66c546da6
|
Translation update done using Pootle.
|
2011-06-20 10:59:58 +02:00 |
|
Panagiotis Papazoglou
|
dba6ca04ed
|
Translation update done using Pootle.
|
2011-06-20 10:59:40 +02:00 |
|
Panagiotis Papazoglou
|
5c2a4eb24e
|
Translation update done using Pootle.
|
2011-06-20 10:59:00 +02:00 |
|
Panagiotis Papazoglou
|
1619c92b7f
|
Translation update done using Pootle.
|
2011-06-20 10:58:43 +02:00 |
|