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

8246 Commits

Author SHA1 Message Date
Marc Delisle
4f48517a41 Merge branch 'QA_4_2' 2014-07-29 09:23:52 -04:00
Marc Delisle
f079e79590 bug #4499 Uncaught TypeError: Cannot call method 'substr' of undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-29 09:22:00 -04:00
Chirayu Chiripal
4522900ef0 RFE-1426: Navigation state lost on reload + Bugfix-4439 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 12:06:31 +05:30
Marc Delisle
ef08d707d5 Merge commit '09b6dc6' 2014-07-23 08:45:55 -07:00
Marc Delisle
09b6dc6c1f bug #4493 s_attention.png is missing 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 08:44:32 -07:00
Marc Delisle
3f241a75e7 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-22 07:30:18 -07:00
Isaac Bennetch
3a215f86c8 Merge pull request #1289 from D-storm/FR-1488 
RFE-1488/781: User privilege tab not shown in all relevant cases
 2014-07-21 15:26:53 -04:00
unknown
da6a835cc9 Merge commit '18a6509f4' 2014-07-21 07:38:07 +02:00
Hugues Peccatte
01e28c6355 Fix #4427: action icons not in horizontal order 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-07-19 21:16:37 +02:00
Marc Delisle
78364505ea Merge commit '77ef5f3' 2014-07-18 16:19:56 -04:00
Marc Delisle
77ef5f3736 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-18 16:18:49 -04:00
Marc Delisle
97273edddf Merge branch 'QA_4_2' 2014-07-18 11:48:02 -04:00
Marc Delisle
e9870f79fc ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-18 11:47:12 -04:00
Marc Delisle
5fa4bf28a8 4.2.6 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 18:09:35 -04:00
Marc Delisle
be0d0f642f 4.2.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 18:08:17 -04:00
Marc Delisle
cb890c5625 Merge branch 'QA_4_2' 2014-07-17 17:31:40 -04:00
Marc Delisle
395265e993 bug #4491 [security] Missing validation for accessing User groups feature 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 17:30:44 -04:00
Marc Delisle
75aa2e8cd2 Merge branch 'QA_4_2' 2014-07-17 17:19:50 -04:00
Marc Delisle
29a1f56495 bug #4492 [security] XSS in AJAX confirmation messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 17:18:52 -04:00
Marc Delisle
c281cb2a70 Merge commit '10014d4' 2014-07-17 16:52:49 -04:00
Marc Delisle
dbfc3acb1f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 16:51:26 -04:00
Marc Delisle
f9d9a8cf9c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-17 16:46:15 -04:00
Chirayu Chiripal
04a3a7073b RFE-1488/781: User privilege tab not shown in all relevant cases 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-18 00:13:08 +05:30
Hugues Peccatte
c25155eb3f Merge commit '83b1351199' 2014-07-15 22:18:48 +02:00
Hugues Peccatte
11ab83f932 Update ChangeLog for #4459. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-07-15 22:03:01 +02:00
Hugues Peccatte
9d3757c8e8 Update ChangeLog with #4459. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-07-15 20:48:00 +02:00
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637 
RFE-637: Custom field handlers (input transformations)
 2014-07-12 09:45:35 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Marc Delisle
f473e99efa Merge branch 'QA_4_2' 2014-07-11 15:46:21 -04:00
Marc Delisle
ce72213095 bug #4489 Incorrect detection of privileges for routine creation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 15:45:31 -04:00
Madhura Jayaratne
10014d4dc5 bug #4488 [security] XSS injection due to unescaped table name (triggers) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 06:39:20 -04:00
Marc Delisle
57475371a5 bug #4486 [security] XSS injection due to unescaped table comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 06:36:17 -04:00
Atul Pratap Singh
7731971f9e Merge branch 'QA_4_2' 2014-07-08 20:34:08 +05:30
Atul Pratap Singh
2e76e83408 Fix bug 4483/4440: selflink was disappearing in certain cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 20:05:46 +05:30
Michal Čihař
f912e090e2 Merge commit 'b0a91accd88c875403cbfea2a5d50d46a3345fc6' 2014-07-08 16:30:25 +02:00
Atul Pratap Singh
b0a91accd8 Fix bug#4485 Sorting breaks the copy column feature 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 17:40:10 +05:30
Marc Delisle
52718ec208 Merge branch 'QA_4_2' 2014-07-07 18:01:20 -04:00
Marc Delisle
eb468f4786 bug #4481 mult_submits.inc.php Undefined variable Error 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-07 18:00:47 -04:00
Marc Delisle
5aee521030 Merge branch 'QA_4_2' 2014-07-07 06:36:11 -04:00
Marc Delisle
ca9ad6015a Undefined variable when grid editing a foreign key column 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-07 06:35:30 -04:00
Marc Delisle
4298b4c141 Merge commit '73ab0b1' 2014-07-05 09:41:33 -04:00
Marc Delisle
73ab0b1034 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-05 09:28:40 -04:00
Marc Delisle
b1059197d7 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-02 06:50:05 -04:00
Atul Pratap Singh
f4b9d1f0aa Merge commit '18973db' 2014-07-02 14:13:21 +05:30
Atul Pratap Singh
18973db3c9 Changelog for 4482 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 11:45:21 +05:30
Marc Delisle
e52092c707 Merge branch 'QA_4_2' 2014-07-01 13:21:54 -04:00
Marc Delisle
cc9f364aab ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-01 13:20:48 -04:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
50cf592e9d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:16:43 -04:00
Hugues Peccatte
929dccb9a3 Cherry-pick dd5ba23: Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-28 19:09:20 +02:00