gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,393 Commits 12 Branches 481 Tags 2.4 GiB
aaa8d22d78
Commit Graph

7034 Commits

Author SHA1 Message Date
Marc Delisle
676715b7f2 Merge branch 'QA_3_5' 2012-07-07 09:23:08 -04:00
Marc Delisle
3ecfb9f36a 3.5.2 release 2012-07-07 09:22:22 -04:00
Madhura Jayaratne
1d93de6ada Merge branch 'QA_3_5' 2012-07-02 21:54:57 +05:30
Madhura Jayaratne
bc5602d079 bug #3526916 [interface] Search fails with JS error when tooltips disabled 2012-07-02 21:51:13 +05:30
Michal Čihař
ce2fd3405a Merge remote-tracking branch 'origin/master' 2012-07-01 17:27:34 +02:00
J.M
f96c97984e Merge branch 'QA_3_5' 2012-07-01 17:27:19 +02:00
J.M
96f6627a53 Move changelog entries of commits reverted in MAINT_3_5_2 to 3.5.3 section 2012-07-01 17:18:57 +02:00
J.M
18b8f215c6 Backport commit 4521b28 to fix bug #3527531, die after sending Location header in url.php 2012-07-01 17:17:35 +02:00
J.M
8f0f6da64c - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 2012-07-01 17:17:31 +02:00
J.M
468998912a - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore 2012-07-01 17:17:27 +02:00
J.M
9e37ad67c3 Merge branch 'QA_3_5' 2012-07-01 15:37:42 +02:00
J.M
49b5c0e63e Merge branch 'MAINT_3_5_2' into QA_3_5 2012-07-01 15:31:06 +02:00
J.M
c401df21e8 - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 2012-07-01 15:29:47 +02:00
J.M
c7e8afd0dc + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table 2012-06-30 18:09:12 +02:00
J.M
76645d2808 Merge branch 'MAINT_3_5_2' into QA_3_5 2012-06-30 16:12:40 +02:00
J.M
a5b8039bba - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore 2012-06-30 16:05:33 +02:00
Marc Delisle
e267d74f6d 3.5.3-dev 2012-06-26 07:35:15 -04:00
Marc Delisle
ef15437ac4 3.5.3-dev 2012-06-26 07:33:55 -04:00
Madhura Jayaratne
6689049b35 bug #3535015 [navi] DbFilter, TableFilter clear buttons hidden on Chrome 2012-06-24 10:26:24 +05:30
Michal Čihař
d80cc28087 Forgot to correctly merge changelog 2012-06-20 10:42:48 +02:00
Michal Čihař
2e354b7b75 Document backport 2012-06-20 10:29:54 +02:00
Rouslan Placella
bf219df66d Merge branch 'QA_3_5' 
Conflicts:
	enum_editor.php
 2012-06-11 14:01:46 +01:00
Rouslan Placella
ddd1eac480 Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values 2012-06-11 14:00:18 +01:00
Rouslan Placella
8f698c7c82 Merge branch 'QA_3_5' 2012-06-10 14:47:10 +01:00
Rouslan Placella
b1855ec0b4 Fixed bug #3534121 - duplicate line in config.sample.inc.php 2012-06-10 14:46:55 +01:00
Rouslan Placella
9b9bd239c3 Merge branch 'QA_3_5' 
Conflicts:
	js/functions.js
	js/server_privileges.js
 2012-06-03 02:08:46 +01:00
Rouslan Placella
1368ff772e Fixed bug #3531586 - Add user form prints JSON when user presses enter 2012-06-03 01:50:28 +01:00
Rouslan Placella
a1eb7f30f4 Fixed bug #3531585 - Broken password validation in copy user form 2012-06-03 01:42:49 +01:00
Rouslan Placella
dbeaeeb7e2 Fixed bug #3531584 - No form validation in change password dialog 2012-06-03 01:20:23 +01:00
Marc Delisle
5c53fb643a Fix merge conflicts 2012-05-24 12:34:15 -04:00
Marc Delisle
07513a599d ChangeLog entry 2012-05-24 07:53:23 -04:00
Michal Čihař
f447066be6 Merge remote-tracking branch 'origin/QA_3_5' 2012-05-15 14:21:04 +02:00
Michal Čihař
4a141a067c bug #3523499 [core] Make X-WebKit-CSP work better 
This seems to work fine in Epiphany and Chromium, I don't have other
browsers to test.
 2012-05-15 14:17:19 +02:00
Marc Delisle
f2d19ef568 Fix merge conflicts 2012-05-05 06:59:51 -04:00
Marc Delisle
533ec68a62 ChangeLog entry for pull request #55 2012-05-05 06:36:45 -04:00
Yuichiro Takahashi
5088e86fd1 Fix popup message on build SQL of import 2012-05-05 18:21:55 +09:00
Marc Delisle
43cddc12a8 Merge branch 'QA_3_5' 2012-05-03 12:34:27 -04:00
Marc Delisle
d212e1a3ea Fix merge conflicts 2012-05-03 12:34:08 -04:00
Marc Delisle
5006c7c07a Merge branch 'QA_3_5' 2012-05-02 10:54:42 -04:00
Marc Delisle
8147dee382 bug #3522930 [browse] Missing validation in Ajax mode 2012-05-02 10:54:27 -04:00
Rouslan Placella
ef61abc9f1 Merge branch 'QA_3_5' 2012-05-01 23:46:22 +01:00
Rouslan Placella
83b5e569a2 Fixed invalid HTML code on transformation_overview.php 2012-05-01 23:45:30 +01:00
Marc Delisle
8648754a48 2011 entries moved to history repo 2012-05-01 15:59:09 -04:00
Marc Delisle
d3a43a48dd Merge branch 'QA_3_5' 2012-05-01 10:38:33 -04:00
Marc Delisle
d26d269a41 bug #3521016 [edit] NOW() function incorrectly selected 2012-05-01 10:38:18 -04:00
Alex Marin
bb4e9695c4 ChangeLog entry for import mediawiki 2012-05-01 02:03:03 +03:00
Marc Delisle
97bdb4c375 Merge branch 'QA_3_5' 2012-04-27 16:25:30 -04:00
Marc Delisle
060a16f448 bug #3521313 [core] Call to undefined function __() 
(backport part of fix from 6a2afedda0)
 2012-04-27 16:24:29 -04:00
Marc Delisle
b4f51cada5 Remove ReplaceHelpImg directive; this is a behavior that belongs to the themes 2012-04-27 15:44:20 -04:00
Marc Delisle
28d45840ac Remove VerboseMultiSubmit configuration directive 2012-04-26 12:37:07 -04:00