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

7068 Commits

Author SHA1 Message Date
Marc Delisle
7bf3fe03a4 Merge branch 'QA_3_5' 2012-08-12 09:26:11 -04:00
Marc Delisle
9ca1bee3c2 Fix merge conflicts 2012-08-12 09:25:37 -04:00
Marc Delisle
5289a032ce 3.5.2.2 release 2012-08-12 09:22:10 -04:00
Marc Delisle
dde8fc471d Merge branch 'QA_3_5' 2012-08-12 09:18:04 -04:00
Marc Delisle
cdf9bf3b83 Merge branch 'MAINT_3_5_2' into QA_3_5 2012-08-12 09:17:19 -04:00
Marc Delisle
6f200703a3 Fix merge conflicts 2012-08-12 09:17:02 -04:00
Madhura Jayaratne
099dee48fd Merge branch 'QA_3_5' 2012-08-11 13:33:41 +05:30
Madhura Jayaratne
1228f48c78 bug #3555104 [edit] Cannot copy a DB with table & views 2012-08-11 13:31:04 +05:30
Madhura Jayaratne
c4a5af9182 Merge branch 'QA_3_5' 
Conflicts:
	js/tbl_select.js
	po/da.po
	tbl_select.php
 2012-08-06 22:04:02 +05:30
Madhura Jayaratne
7e0028e4af bug #3540922 [edit] Error searching table with many fields 2012-08-06 21:44:16 +05:30
J.M
53f96bd760 bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 2012-08-06 09:20:07 +02:00
Michal Čihař
fdfffabda3 Merge pull request #84 from roccivic/autoselect-login-form 
Autoselect username input on cookie login page
 2012-08-05 23:58:57 -07:00
Madhura Jayaratne
4de69abcf7 Merge branch 'QA_3_5' 
Conflicts:
	pmd_general.php
 2012-08-04 22:18:41 +05:30
Madhura Jayaratne
7e3924e318 [interface] Designer sometimes places tables on the top menu 2012-08-04 22:15:04 +05:30
Marc Delisle
8fd5339401 Merge branch 'QA_3_5' 2012-08-03 13:06:46 -04:00
Marc Delisle
3110bacb81 3.5.2.1 release date 2012-08-03 13:06:28 -04:00
Marc Delisle
4b133e277f 3.5.2.1 release date 2012-08-03 13:05:05 -04:00
Marc Delisle
216878b987 Merge branch 'QA_3_5' 2012-08-03 12:57:12 -04:00
Marc Delisle
45de0c0d98 Fix merge conflicts 2012-08-03 12:56:38 -04:00
Rouslan Placella
68f6226f46 Merge branch 'QA_3_5' 
Conflicts:
	libraries/mult_submits.inc.php
	po/ca.po
 2012-08-02 12:10:44 +02:00
Rouslan Placella
9699979ea9 Fixed bug #3553551 - Invalid HTML code in multi submits confirmation form 2012-08-02 12:05:20 +02:00
J.M
0f0c2f1e2b - [security] Fixed local path disclosure vulnerability 2012-07-31 23:22:41 +02:00
Madhura Jayaratne
3ad443a656 Merge branch 'QA_3_5' 2012-07-29 08:09:02 +05:30
Alain ICHE
66100f67d7 bug #3541966 [config] Error in generated configuration array 2012-07-29 08:05:04 +05:30
Madhura Jayaratne
70e28dfdf0 Merge branch 'QA_3_5' 2012-07-28 19:16:51 +05:30
Madhura Jayaratne
191cf52cd0 bug #3547825 [edit] BLOB download no longer works 2012-07-28 19:15:39 +05:30
Madhura Jayaratne
9282f48caf Merge branch 'QA_3_5' 
Conflicts:
	tbl_select.php
 2012-07-28 17:32:12 +05:30
Madhura Jayaratne
ad1bc257e4 bug #3548491 [interface] Inline query editor doesn't work from search results 2012-07-28 17:29:52 +05:30
Madhura Jayaratne
17ad243469 Merge branch 'QA_3_5' 2012-07-28 17:14:08 +05:30
Madhura Jayaratne
a143b74067 bug #3549084 [edit] Can't enter date directly when editing inline 2012-07-28 17:10:44 +05:30
Rouslan Placella
2e1d147411 Autoselect username input on cookie login page 2012-07-25 11:27:14 +01:00
Rouslan Placella
b2cd7b3baf Merge branch 'QA_3_5' 2012-07-15 15:55:54 +01:00
Rouslan Placella
91b9c630c3 Fixed bug #3544366 - Event comments not saved 2012-07-15 15:55:39 +01:00
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
Marc Delisle
c03538c1ed 3.5.2 release 2012-07-07 09:09:51 -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