Commit Graph

8515 Commits

Author SHA1 Message Date
Marc Delisle
fa6ca2a504 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-06 18:27:47 -05:00
Marc Delisle
e435379efd ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-06 18:24:51 -05:00
Marc Delisle
e2c9a90425 Merge branch 'QA_4_3' 2014-12-05 10:10:50 -05:00
Marc Delisle
71f5737c5b 4.3.0 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-05 10:10:10 -05:00
Chirayu Chiripal
573f85f1bf Fix bug-4613 HHVM: method ob_gzhandler not found
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-12-05 16:05:48 +05:30
Madhura Jayaratne
270b37c775 Merge branch 'QA_4_3' 2014-12-05 07:35:37 +05:30
Madhura Jayaratne
e9e4faaeb4 bug #4618 Page scrolls while GIS visualization is zoomed in/out with mousewheel
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-05 07:34:42 +05:30
Marc Delisle
00db138a47 bug #4620 Undefined index while adding to the central columns list
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-04 14:01:52 -05:00
Marc Delisle
3aa884ee36 Fix undefined index notice (fields) in PMA_getParamsForUpdateOrInsert()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-04 10:35:58 -05:00
Marc Delisle
bd2a8b501c Fix other undefined index notices in PMA_getDiagMessageForFeature()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-04 09:15:18 -05:00
Marc Delisle
af52584a27 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 12:38:31 -05:00
Marc Delisle
9591205e2c Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 09:06:49 -05:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 08:50:14 -05:00
Michal ฤŒihaล™
1daa32fb97 bug #4612 [security] XSS vulnerability in redirection mechanism
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 08:29:55 -05:00
Marc Delisle
36f2f91c1a Merge branch 'QA_4_3' 2014-12-02 10:28:34 -05:00
Marc Delisle
85c866fb8f Bug Undefined index navwork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-02 10:28:03 -05:00
Madhura Jayaratne
bd02f91a2a Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 13:26:53 +05:30
Madhura Jayaratne
58df5ebed5 bug #4616 Warning in db structure print view page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 13:17:54 +05:30
Madhura Jayaratne
8fcf249a28 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 12:26:57 +05:30
Madhura Jayaratne
5d0a2298e2 bug #4615 SQL highlighting in process list breaks on auto refresh
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 12:25:05 +05:30
Marc Delisle
e61dc35ba3 Merge branch 'QA_4_3' 2014-12-01 10:31:32 -05:00
Marc Delisle
a117cb2552 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-01 10:31:02 -05:00
Marc Delisle
c4966c6fb5 Merge commit '41277d1' 2014-11-30 06:37:49 -05:00
Marc Delisle
1292a53379 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-11-30 06:36:33 -05:00
Marc Delisle
41277d1887 4.2.13 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-30 06:35:21 -05:00
Marc Delisle
73e4c5653f Merge branch 'QA_4_3' 2014-11-29 06:50:03 -05:00
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-29 06:49:24 -05:00
Madhura Jayaratne
1c6af0f7b9 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 11:18:57 +05:30
Madhura Jayaratne
5c02da89be ChangeLog entry for bug #4227
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 11:01:18 +05:30
Ann + J.M
b23a40f39c Merge branch 'QA_4_3'
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-11-27 16:49:06 +01:00
Ann + J.M
2e9b80e9e3 [DOC] Add ChangeLog entry for bug #4610
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-11-27 16:46:15 +01:00
Ann + J.M
36e49e496c [DOC] Add ChangeLog entry for bug #4609
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-11-27 16:42:25 +01:00
Madhura Jayaratne
6fb9a53b4a Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-27 10:34:44 +05:30
Madhura Jayaratne
10b958c1ba Merge branch 'QA_4_2' into QA_4_3 2014-11-27 10:27:34 +05:30
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-27 10:25:42 +05:30
Marc Delisle
8c16aa8a3d 4.3.1-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-26 11:21:52 -05:00
Marc Delisle
496602674c 4.3.1-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-26 11:20:54 -05:00
Madhura Jayaratne
8807575586 Merge branch 'tracking' 2014-11-26 18:08:55 +05:30
Madhura Jayaratne
d9c3b9cbed rfe #1564 Improve action message on Tracking page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 16:08:26 +05:30
Madhura Jayaratne
bf175e00bb Merge branch 'QA_4_3' 2014-11-26 12:59:40 +05:30
Madhura Jayaratne
f5c263119d Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 12:44:09 +05:30
Madhura Jayaratne
9a818c289d bug #4607 Syntax error during db_copy operation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 12:39:09 +05:30
Madhura Jayaratne
3b2f62d3c2 Tracking improvements. Implements rfe #1562
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-25 17:31:53 +05:30
Madhura Jayaratne
6b71a1130f Merge branch 'QA_4_3' 2014-11-25 10:28:38 +05:30
Madhura Jayaratne
57413772c1 Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-25 10:26:09 +05:30
Madhura Jayaratne
14a77261d2 bug #4606 Tracking report export as SQL dump does not work
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-25 10:21:18 +05:30
Madhura Jayaratne
e1ca65b49e Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-25 09:29:39 +05:30
Madhura Jayaratne
0fda8293f4 Merge branch 'QA_4_2' into QA_4_3 2014-11-25 09:15:08 +05:30
Madhura Jayaratne
8607de61e0 bug #4605 Unseen messages in tracking
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-25 09:01:35 +05:30