Commit Graph

36585 Commits

Author SHA1 Message Date
Michal Čihař
e3a73f0e7a Ignore file which is present on demo server 2011-05-25 06:55:33 +02:00
Marc Delisle
29940ea6b0 Put back the div that was generated by previous slider 2011-05-24 10:51:26 -04:00
Marc Delisle
24a7764533 bug #3306958 [interface] Unnecessary Details slider 2011-05-24 10:35:04 -04:00
Michal Čihař
c76187732b Update from master 2011-05-24 08:53:10 +02:00
Michal Čihař
eb52f22eb0 bug #3276001 [core] Avoid caching of index.php. 2011-05-23 13:19:43 +02:00
Michal Čihař
548b62e93f Update po files 2011-05-23 10:40:26 +02:00
Michal Čihař
adc6de0685 [auth] Fixed error handling for signon auth method.
The message is now stored in caller session data and properly displayed
in example script.
2011-05-23 10:33:14 +02:00
Madhura Jayaratne
e936257d44 bug #3305883 [interface] Table is dropped regardless of confirmation 2011-05-22 22:01:47 +05:30
Madhura Jayaratne
16305005c5 bug #3305517 [config] Config for export compression not used 2011-05-22 13:00:39 +05:30
Madhura Jayaratne
f5eaf8c7d8 bug #3305606 [interface] Show all button wraps on privileges page 2011-05-22 09:30:44 +05:30
Marc Delisle
16a28bbeaa 3.4.1 2011-05-20 13:17:17 -04:00
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