Marc Delisle
|
20cf17923e
|
Merge branch 'MAINT_3_4_1' into QA_3_4
|
2011-05-20 12:55:32 -04:00 |
|
Marc Delisle
|
89c8f3cbfe
|
ChangeLog entries for security fixes
|
2011-05-20 12:55:23 -04:00 |
|
Marc Delisle
|
8fd8e3efd8
|
Merge branch 'MAINT_3_4_1' into QA_3_4
|
2011-05-20 12:50:38 -04:00 |
|
Herman van Rink
|
7e10c132a3
|
XSS in Tracking page, more
|
2011-05-20 12:49:49 -04:00 |
|
Herman van Rink
|
d3ccf798fd
|
XSS in Tracking page
|
2011-05-20 12:41:33 -04:00 |
|
Michal Čihař
|
e22344168f
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-20 10:02:48 +02:00 |
|
Michal Čihař
|
b7a8179eb6
|
Can not use redirector for setup.
We currently have no reasonable way to protect it there.
|
2011-05-20 09:46:15 +02:00 |
|
Michal Čihař
|
1a1e548a39
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-20 09:02:05 +02:00 |
|
Michal Čihař
|
ecfc8ba4f7
|
Make redirector require valid token
|
2011-05-20 09:01:20 +02:00 |
|
Michal Čihař
|
0ea08ee473
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-20 08:33:22 +02:00 |
|
Michal Čihař
|
32d8446e01
|
Update from master
|
2011-05-20 08:32:16 +02:00 |
|
Michal Čihař
|
05e7ce152d
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-19 09:44:04 +02:00 |
|
Michal Čihař
|
e043bfe2af
|
Merge translations from master
|
2011-05-19 09:40:52 +02:00 |
|
Yuichiro
|
81f939f5df
|
patch #3303813 [setup] Define a label that was missing
|
2011-05-18 08:06:44 -04:00 |
|
Marc Delisle
|
ac9d911c3f
|
bug #3303869 [interface] Unnecessary scrolling on Databases page
|
2011-05-18 07:39:42 -04:00 |
|
Michal Čihař
|
c88379f4d4
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-18 13:18:34 +02:00 |
|
Michal Čihař
|
b0ff5b4b51
|
Update translations from master
|
2011-05-18 13:17:57 +02:00 |
|
Madhura Jayaratne
|
6780808723
|
Correction to the changelog entry
|
2011-05-17 22:25:46 +05:30 |
|
Madhura Jayaratne
|
b091f91f92
|
bug #3301249 [interface] Iconic table operations does not remove inline edit label
|
2011-05-17 22:15:58 +05:30 |
|
Michal Čihař
|
2f2157cf24
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-17 17:34:20 +02:00 |
|
Michal Čihař
|
4ef745156e
|
Merge translations from master
|
2011-05-17 17:33:40 +02:00 |
|
Michal Čihař
|
844d105898
|
Merge translations from master
|
2011-05-17 15:54:06 +02:00 |
|
Michal Čihař
|
bfd7073903
|
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
|
2011-05-17 14:30:45 +02:00 |
|
Michal Čihař
|
2d388d5856
|
Update po files
|
2011-05-17 14:28:25 +02:00 |
|
Marc Delisle
|
9a8407e5ce
|
3.4.2-dev
|
2011-05-17 07:43:15 -04:00 |
|
Michal Čihař
|
32cdee1d8a
|
Merge branch 'MAINT_3_4_1' into QA_3_4
|
2011-05-17 13:38:51 +02:00 |
|
Michal Čihař
|
a225369157
|
Translations from master
|
2011-05-17 13:37:46 +02:00 |
|
Marc Delisle
|
73ff83747d
|
3.4.1-rc1
|
2011-05-17 07:27:09 -04:00 |
|
Marc Delisle
|
bed8707eea
|
Merge branch 'MAINT_3_4_1' into QA_3_4
|
2011-05-17 07:23:15 -04:00 |
|
Marc Delisle
|
46245d0c9b
|
bug #3302733 [core] Some browsers report an insecure https connection
|
2011-05-17 07:22:56 -04:00 |
|
Michal Čihař
|
65c38cce30
|
Translations from master
|
2011-05-17 13:14:41 +02:00 |
|
Michal Čihař
|
3b9333badd
|
Merge from master
|
2011-05-17 00:29:21 +02:00 |
|
Marc Delisle
|
71a533536b
|
bug #3302872 [synchronize] Synchronize and user name
|
2011-05-16 12:53:10 -04:00 |
|
Michal Čihař
|
d0b9caa050
|
New translations from master
|
2011-05-16 16:18:36 +02:00 |
|
Herman van Rink
|
3c0fcf7ca1
|
Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4
|
2011-05-16 14:52:22 +02:00 |
|
Herman van Rink
|
c021d2f719
|
bug #3285929 [privileges] Revert temporary fix
|
2011-05-16 14:51:42 +02:00 |
|
Michal Čihař
|
c1a1d0054c
|
Add translation from master
|
2011-05-16 10:39:24 +02:00 |
|
Michal Čihař
|
aba316155b
|
Do not use localised docs here
|
2011-05-16 10:38:52 +02:00 |
|
Michal Čihař
|
db48100cd1
|
Check for existence of a file
|
2011-05-16 10:37:59 +02:00 |
|
Michal Čihař
|
92d139d5f8
|
Add script for merging translations
|
2011-05-16 10:37:04 +02:00 |
|
Michal Čihař
|
1816db53d1
|
Update po files
|
2011-05-16 10:32:15 +02:00 |
|
Marc Delisle
|
ee22340d83
|
bug #3300981 [navi] Table filter is case sensitive
|
2011-05-15 18:25:20 -04:00 |
|
Yuichiro
|
6923ccab3e
|
Patch #3302313 Show a translated label
|
2011-05-15 13:23:51 -04:00 |
|
Marc Delisle
|
e5826013d7
|
Prevent notice for undefined variable
|
2011-05-15 12:46:11 -04:00 |
|
Madhura Jayaratne
|
dd3bd9043d
|
Changelog entry
|
2011-05-15 12:37:22 -04:00 |
|
Madhura Jayaratne
|
8bad4aea1e
|
Bug #3302457 - Inline edit and $cfg['PropertiesIconic']
|
2011-05-15 21:15:35 +05:30 |
|
Rouslan Placella
|
989a1f35e9
|
Fixed some indentation
|
2011-05-14 06:25:32 -04:00 |
|
Rouslan Placella
|
20a04b2f2b
|
Patch 3301623 Clear button does not work
|
2011-05-14 06:23:28 -04:00 |
|
Michal Čihař
|
aa8c5f56d2
|
Merge branch 'MAINT_3_4_0' into QA_3_4
|
2011-05-13 13:02:56 +02:00 |
|
Michal Čihař
|
ad3f6cb16a
|
Warning class is gone
|
2011-05-13 13:02:46 +02:00 |
|