Sreedeep Moulik [Wed, 24 Apr 2013 08:32:51 +0000 (17:32 +0900)]
Merge "Accesibility Issue Fixes in DTP" into tizen_2.1
jaewon7.cho [Wed, 24 Apr 2013 08:31:30 +0000 (17:31 +0900)]
Merge "Update Doxygen for Optimal Size" into tizen_2.1
MinSung Jin [Wed, 24 Apr 2013 08:14:11 +0000 (17:14 +0900)]
Merge "fixed preceding space on TableView" into tizen_2.1
jaewon7.cho [Wed, 24 Apr 2013 08:09:15 +0000 (17:09 +0900)]
Update Doxygen for Optimal Size
Change-Id: Id64b44959ae100a7e7fa780b93ce2b2934c53aa6
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
sr.shashank [Wed, 24 Apr 2013 08:04:04 +0000 (17:04 +0900)]
Merge "Fix for TDIS-5476. (Resetting the divider position in case of MaximizePane)." into tizen_2.1
Chulheon [Wed, 24 Apr 2013 07:47:58 +0000 (16:47 +0900)]
Merge "fixed bug (The scroll does not work on flicking)" into tizen_2.1
Chulheon [Wed, 24 Apr 2013 05:21:00 +0000 (14:21 +0900)]
fixed bug (The scroll does not work on flicking)
Change-Id: I1060ddb5b2f5fa9ee34285628e4a8306c49f7aca
Keuckdo Bang [Wed, 24 Apr 2013 06:18:47 +0000 (15:18 +0900)]
Fixed logic that setting current form when minimized mode.
Change-Id: I059d4a6a13e75fb50e6360e0e3b495efc668c6e9
Sreedeep Moulik [Tue, 23 Apr 2013 04:56:36 +0000 (10:26 +0530)]
Accesibility Issue Fixes in DTP
Change-Id: I23248550f3463357943e6aa1a21a5772eb8e7aa7
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Minkyoung Kang [Wed, 24 Apr 2013 02:33:19 +0000 (11:33 +0900)]
fixed wrong link
Change-Id: I3bdbdc2d1f6d1abceee2ded8caedb3d0fd210838
MinSung Jin [Wed, 24 Apr 2013 01:44:27 +0000 (10:44 +0900)]
fixed preceding space on TableView
Change-Id: I6e11299cbf3ad3e8e8cf5c6bf62106ac73112eb4
Signed-off-by: MinSung Jin <minsung.jin@samsung.com>
Yunji Park [Wed, 24 Apr 2013 00:53:19 +0000 (09:53 +0900)]
Merge "Fixed to check compose done during line composing" into tizen_2.1
Yunji Park [Wed, 24 Apr 2013 00:50:50 +0000 (09:50 +0900)]
Fixed to check compose done during line composing
Change-Id: Ic9bd4d7affaead4f5e4467d8d107e52ba14e3454
woo [Wed, 24 Apr 2013 00:36:39 +0000 (09:36 +0900)]
fix file permission and remove ^M char
Change-Id: Ie17195b25d2a74408fc82253851d7a5bae9576b7
Signed-off-by: woo <s-w.woo@samsung.com>
Ki-Dong Hong [Tue, 23 Apr 2013 23:16:38 +0000 (08:16 +0900)]
Merge "Modify for N_SE-35852" into tizen_2.1
Syed Khaja Moinuddin [Tue, 23 Apr 2013 22:58:11 +0000 (07:58 +0900)]
Fixed N_SE-35894 in EditDate / EDitTime
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I861032b24389cfb585114481fbccb3ee9773a95f
Poornima Srinivasan [Tue, 23 Apr 2013 16:15:41 +0000 (01:15 +0900)]
Merge "Fix for N_SE-35827, N_SE-35901, N_SE-35908. Signed-off-by: sriram.k <sriram.k@samsung.com>" into tizen_2.1
Syed Khaja Moinuddin [Thu, 11 Apr 2013 03:14:27 +0000 (12:14 +0900)]
Accessibility Issues fixed in DateTimeBar.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Icd666e637c003ed50dc5b5b29db9671b9ae8c8ed
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
sriram.k [Tue, 23 Apr 2013 16:07:24 +0000 (21:37 +0530)]
Fix for N_SE-35827, N_SE-35901, N_SE-35908.
Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: I64290c335aedf15b84ff1dee09d8a3a1e98fc878
MyungJinKim [Tue, 23 Apr 2013 14:56:52 +0000 (23:56 +0900)]
Merge "fix jira defect and DCM issue" into tizen_2.1
Syed Khaja Moinuddin [Tue, 23 Apr 2013 14:53:04 +0000 (23:53 +0900)]
Merge "Fix for N_SE-35474 in EDitDate & EditTime Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.1
Myung Jin Kim [Tue, 23 Apr 2013 14:46:26 +0000 (23:46 +0900)]
fix jira defect and DCM issue
Change-Id: I4faf1a055a68174baf9b0dcf1ba68540e3337cdd
Syed Khaja Moinuddin [Tue, 23 Apr 2013 13:59:33 +0000 (22:59 +0900)]
Fix for N_SE-35474 in EDitDate & EditTime
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Ied4cc4aade96b957efe931e6e9cb49f085dd3b9d
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
wonyoung12.lee [Tue, 23 Apr 2013 12:56:33 +0000 (21:56 +0900)]
Modify for N_SE-35852
Change-Id: Ifc259982c334730511475db74db06ab0accf45d7
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>
minkyu kim [Tue, 23 Apr 2013 13:22:12 +0000 (22:22 +0900)]
Merge "return null if touched control is none" into tizen_2.1
minkyu kim [Tue, 23 Apr 2013 13:20:05 +0000 (22:20 +0900)]
return null if touched control is none
Change-Id: Ic86a54912d7b3ee2636812fbafd8c91be2683f10
JongHyun Yoon [Tue, 23 Apr 2013 12:44:00 +0000 (21:44 +0900)]
Merge "fixed bug (Paste does not work in url address in composer field N_SE-35898 )" into tizen_2.1
ChulWooLee [Tue, 23 Apr 2013 12:36:40 +0000 (21:36 +0900)]
Merge "Modify for N-SE_35171, P130422-4358" into tizen_2.1
Chulheon [Tue, 23 Apr 2013 12:07:20 +0000 (21:07 +0900)]
fixed bug (Paste does not work in url address in composer field N_SE-35898 )
Change-Id: I69cd5b172d273f70e19a89dca89353af2c3d2aeb
Choongeun Hong [Tue, 23 Apr 2013 11:36:22 +0000 (20:36 +0900)]
Fixed progresspopup issue
Change-Id: I1d60d72ef652ae3d11d132ddc859319b4274c2fe
Signed-off-by: Choongeun Hong <cheun.hong@samsung.com>
wonyoung12.lee [Tue, 23 Apr 2013 10:41:24 +0000 (19:41 +0900)]
Modify for N-SE_35171, P130422-4358
Change-Id: I4b6703830a32d8933758fe6fe9e19fa5adc1de04
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>
sr.shashank [Tue, 23 Apr 2013 10:32:47 +0000 (16:02 +0530)]
Fix for TDIS-5476. (Resetting the divider position in case of MaximizePane).
Change-Id: Iec3ddd7d5893394acdaf485d4739e1b7d33440be
Signed-off-by: sr.shashank <sr.shashank@samsung.com>
clone [Tue, 23 Apr 2013 09:51:05 +0000 (18:51 +0900)]
Merge "Fixed N_SE-34679 and made to use screen fully.(bg already has margins)" into tizen_2.1
Syed Khaja Moinuddin [Tue, 23 Apr 2013 09:50:40 +0000 (18:50 +0900)]
Merge "Fixed Variable name as per coding idiom Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.1
youseong.ji [Tue, 23 Apr 2013 09:47:19 +0000 (18:47 +0900)]
Merge "Modified for touch canceled method on tableviewitem" into tizen_2.1
clone [Tue, 23 Apr 2013 06:26:45 +0000 (15:26 +0900)]
Fixed N_SE-34679 and made to use screen fully.(bg already has margins)
Change-Id: Ibc0745bbd635f94a3ae0518871189240a2e4bbb4
Signed-off-by: clone <ingyou.park@samsung.com>
sr.shashank [Tue, 23 Apr 2013 09:24:50 +0000 (18:24 +0900)]
Merge "Fix for TDIS-5458." into tizen_2.1
DongJinJeon [Tue, 23 Apr 2013 09:21:42 +0000 (18:21 +0900)]
Merge "modify button text on MessageBox, ProgressPopup" into tizen_2.1
Bumseung Cho [Tue, 23 Apr 2013 09:16:26 +0000 (18:16 +0900)]
Merge "Accessibility Bug Fix" into tizen_2.1
keonpyo.kong [Tue, 23 Apr 2013 08:47:33 +0000 (17:47 +0900)]
ConvetToFloat api is modified that is unaffected by locale
Change-Id: I79c1043fa8a5a15110a4763121be552b89a2a489
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
apply code review
Change-Id: Icb802a14a9c183ffeb1fa07a7218ea1a695be37e
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
MinSung Jin [Tue, 23 Apr 2013 07:44:31 +0000 (16:44 +0900)]
modified UpdateTableView doxygen
Change-Id: I19e1e5276e263b33e9a5e965c58f20b0e469dfa9
Signed-off-by: MinSung Jin <minsung.jin@samsung.com>
Syed Khaja Moinuddin [Tue, 23 Apr 2013 07:55:52 +0000 (16:55 +0900)]
Fixed Variable name as per coding idiom
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I181730d1ac9fd1aef9995dc181c57f0882e25433
Syed Khaja Moinuddin [Tue, 23 Apr 2013 07:51:17 +0000 (16:51 +0900)]
Merge "SysTryCatch Fix Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.1
Syed Khaja Moinuddin [Tue, 23 Apr 2013 07:48:33 +0000 (16:48 +0900)]
SysTryCatch Fix
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: If6aa13f63980398af71baf3829078d53392f094a
Syed Khaja Moinuddin [Tue, 23 Apr 2013 07:42:20 +0000 (16:42 +0900)]
Merge "Prevent issue fixed. Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.1
Syed Khaja Moinuddin [Tue, 23 Apr 2013 07:36:37 +0000 (16:36 +0900)]
Prevent issue fixed.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Ida78050d29e41b2b61a3538624432d93fb66b267
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
youseong.ji [Tue, 23 Apr 2013 07:33:52 +0000 (16:33 +0900)]
Modified for touch canceled method on tableviewitem
Change-Id: I3f82dc6a467c95b8b23af0b90fe8d87ef1dcfc76
Signed-off-by: youseong.ji <youseong.ji@samsung.com>
Bumseung Cho [Tue, 23 Apr 2013 07:29:19 +0000 (16:29 +0900)]
Accessibility Bug Fix
Change-Id: Ia66297d733f8ab7d6d97f1ee842f87262a082cc4
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>
sr.shashank [Tue, 23 Apr 2013 07:20:28 +0000 (12:50 +0530)]
Fix for TDIS-5458.
Change-Id: I73ad6e5b228806ff37ffe1f9fc903c451b2e18f7
Signed-off-by: sr.shashank <sr.shashank@samsung.com>
woo [Tue, 23 Apr 2013 07:18:25 +0000 (16:18 +0900)]
apply header review
Change-Id: Ia4fc4d251869b6618ee60f97660636c88ea1a33c
Signed-off-by: woo <s-w.woo@samsung.com>
Choongeun Hong [Tue, 23 Apr 2013 07:13:19 +0000 (16:13 +0900)]
Merge "Merge review header file" into tizen_2.1
Bumseung Cho [Tue, 23 Apr 2013 03:06:06 +0000 (12:06 +0900)]
Accessibility bug fix
Change-Id: Ic69a367e4ae8fb1a23ce23894d2cf4fcf4aa163e
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>
Choongeun Hong [Tue, 23 Apr 2013 07:08:45 +0000 (16:08 +0900)]
Merge review header file
Change-Id: Ib8f4e976ec5a9bf5ffc8bc1c111193c32ed7d9df
Signed-off-by: Choongeun Hong <cheun.hong@samsung.com>
SangYong Lee [Tue, 23 Apr 2013 05:12:40 +0000 (14:12 +0900)]
Merge "Added default item height exception in PreloadItem" into tizen_2.1
DongJinJeon [Tue, 23 Apr 2013 05:00:12 +0000 (14:00 +0900)]
modify button text on MessageBox, ProgressPopup
Change-Id: I03e7cde23a7f2816367656bc70ab348d4daf32bc
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
SeungwanWoo [Tue, 23 Apr 2013 02:59:45 +0000 (11:59 +0900)]
Merge "Revert "modify button text on MessageBox, ProgressPopup"" into tizen_2.1
SeungwanWoo [Tue, 23 Apr 2013 02:55:34 +0000 (11:55 +0900)]
Revert "modify button text on MessageBox, ProgressPopup"
This reverts commit
7fc630cf10b46c3eaca672507877513c06a83d8a
SangYong Lee [Tue, 23 Apr 2013 02:04:47 +0000 (11:04 +0900)]
Added default item height exception in PreloadItem
Change-Id: Ibbcf36893b79751694390261b882c81e8169c3c3
Signed-off-by: SangYong Lee <sangyongim.lee@samsung.com>
MinSung Jin [Mon, 22 Apr 2013 12:42:27 +0000 (21:42 +0900)]
Merge "reflected review on public headers in TableView" into tizen_2.1
DongJinJeon [Mon, 22 Apr 2013 10:53:11 +0000 (19:53 +0900)]
modify button text on MessageBox, ProgressPopup
Change-Id: I94a6e85fa25515d0ff1093912bbf4e2f51af3d5f
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
MyungJinKim [Mon, 22 Apr 2013 09:27:32 +0000 (18:27 +0900)]
Merge "fix check handler position while rotating" into tizen_2.1
Myung Jin Kim [Mon, 22 Apr 2013 09:22:28 +0000 (18:22 +0900)]
fix check handler position while rotating
Change-Id: I6edee97a44ae9f657da017ca00d08704ffeeea46
MinSung Jin [Mon, 22 Apr 2013 09:15:33 +0000 (18:15 +0900)]
reflected review on public headers in TableView
Change-Id: I003455034153d99df8b8e722c9883727da442a51
Signed-off-by: MinSung Jin <minsung.jin@samsung.com>
Janardhana Srirama Sarma Kakarla [Mon, 22 Apr 2013 09:14:41 +0000 (18:14 +0900)]
Merge "Modification based on magnolia/doc/sdk-internal Signed-off-by: sriram.k <sriram.k@samsung.com>" into tizen_2.1
sriram.k [Mon, 22 Apr 2013 09:07:07 +0000 (14:37 +0530)]
Modification based on magnolia/doc/sdk-internal
Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: I414bebd0941265f599c94846b2285aae480f84b5
Park Joon-Young [Mon, 22 Apr 2013 08:19:53 +0000 (17:19 +0900)]
Merge changes I0677c3e2,Ie9819a45 into tizen_2.1
* changes:
Reflected review on public headers.
Fixed N_SE-35294; ContextMenu list style scrollable fires event of the item out of sight.
Eunyoung(Erin) Choi [Mon, 22 Apr 2013 08:19:20 +0000 (17:19 +0900)]
Merge "update header for Doxygen" into tizen_2.1
Janardhana Srirama Sarma Kakarla [Mon, 22 Apr 2013 08:14:18 +0000 (17:14 +0900)]
Merge "Included changes from magnolia/doc/sdk-internal Signed-off-by: sriram.k <sriram.k@samsung.com>" into tizen_2.1
sriram.k [Mon, 22 Apr 2013 07:00:04 +0000 (12:30 +0530)]
Included changes from magnolia/doc/sdk-internal
Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: Ie3fd13fdbd7c6d9b6470d8b2b48ee33f953b860e
DongJinJeon [Mon, 22 Apr 2013 08:08:32 +0000 (17:08 +0900)]
Merge "apply header review on Popup, ProgressPopup and MessageBox" into tizen_2.1
Minkyoung Kang [Mon, 22 Apr 2013 07:58:35 +0000 (16:58 +0900)]
update header for Doxygen
Change-Id: Ic6dc6f968d24ac38c9c5d7311e9c9bc4bb3b5af9
wonyoung12.lee [Mon, 22 Apr 2013 07:45:47 +0000 (16:45 +0900)]
Merge "Apply Header review for IconListView" into tizen_2.1
Hyeonmi Kim [Mon, 22 Apr 2013 07:36:11 +0000 (16:36 +0900)]
Merge "Applied header review on ListView/GroupedListView" into tizen_2.1
WonBae Kim [Mon, 22 Apr 2013 07:31:58 +0000 (16:31 +0900)]
Merge "fix build error" into tizen_2.1
Chulheon [Mon, 22 Apr 2013 07:31:15 +0000 (16:31 +0900)]
fix build error
Change-Id: Ifb2192d95317fc4eac9b03e1df80eef2f4c97b9e
Chulheon [Mon, 22 Apr 2013 07:20:41 +0000 (16:20 +0900)]
Merge "applied new IMF_LAYOUT (ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD)" into tizen_2.1
Chulheon [Mon, 22 Apr 2013 07:12:27 +0000 (16:12 +0900)]
applied new IMF_LAYOUT (ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD)
Change-Id: I33fddd9ef93afb67e816aed4167c5565fe535c52
MyungJinKim [Mon, 22 Apr 2013 07:13:01 +0000 (16:13 +0900)]
Merge "apply reviwed doxygen" into tizen_2.1
“Bumseung [Mon, 22 Apr 2013 07:06:46 +0000 (16:06 +0900)]
Merge "ResourceMgr bug fix." into tizen_2.1
Myung Jin Kim [Mon, 22 Apr 2013 07:05:36 +0000 (16:05 +0900)]
apply reviwed doxygen
Change-Id: I37fb883b4ead979f797de2a4c88720aad2501c6d
hoonik.lee [Mon, 22 Apr 2013 06:55:29 +0000 (15:55 +0900)]
Merge "Modify doxygen of Canvas::SetPosition" into tizen_2.1
hoonik.lee [Mon, 22 Apr 2013 06:35:58 +0000 (15:35 +0900)]
Modify doxygen of Canvas::SetPosition
Change-Id: Iea7e2bfbba612375d7558d7ec54c21e77e325385
Signed-off-by: hoonik.lee <hoonik.lee@samsung.com>
Hyeonmi Kim [Mon, 22 Apr 2013 05:24:51 +0000 (14:24 +0900)]
Applied header review on ListView/GroupedListView
Change-Id: I6616983817719827571d1a1c4d2d7a9111b33094
Signed-off-by: Hyeonmi Kim <hm_85.kim@samsung.com>
woo [Mon, 22 Apr 2013 06:25:17 +0000 (15:25 +0900)]
bug fix
Change-Id: I645bce55af60f4a3db8f91ebb8084afeb0e194bb
Signed-off-by: woo <s-w.woo@samsung.com>
wonyoung12.lee [Mon, 22 Apr 2013 06:22:51 +0000 (15:22 +0900)]
Apply Header review for IconListView
Change-Id: Ic13e01ebb97f851bcab1ba3f29e00954e490ba7a
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>
woo [Mon, 22 Apr 2013 05:46:37 +0000 (14:46 +0900)]
Merge "apply header review" into tizen_2.1
Sungyeon Woo [Mon, 22 Apr 2013 05:42:53 +0000 (14:42 +0900)]
Merge "remove Mismatched valgrind message in Font" into tizen_2.1
Bang Keuck do [Mon, 22 Apr 2013 05:39:21 +0000 (14:39 +0900)]
Merge "Apply reviewed header files." into tizen_2.1
Sungyeon Woo [Mon, 22 Apr 2013 05:34:14 +0000 (14:34 +0900)]
remove Mismatched valgrind message in Font
Change-Id: I12994e63d07fc5f3fca9983536d73e18712fac3a
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
MyungJinKim [Mon, 22 Apr 2013 05:32:28 +0000 (14:32 +0900)]
Merge "apply header back maker" into tizen_2.1
DongJinJeon [Mon, 22 Apr 2013 05:23:28 +0000 (14:23 +0900)]
apply header review on Popup, ProgressPopup and MessageBox
Change-Id: Ie8148c10332e08fb57ad6dfc52f35f04968b6141
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>
wonyoung12.lee [Mon, 22 Apr 2013 05:21:18 +0000 (14:21 +0900)]
Merge "Modify for P130417-9332, P130419-3682, add RestoreItemSatus() after UpdateList" into tizen_2.1
JongwooLee [Mon, 22 Apr 2013 05:20:24 +0000 (14:20 +0900)]
Merge "Apply header review on Gallery" into tizen_2.1
Park Kyoung Hee [Mon, 22 Apr 2013 05:17:55 +0000 (14:17 +0900)]
Merge "apply header review on Panel, ScrollPanel" into tizen_2.1
JongwooLee [Mon, 22 Apr 2013 04:44:24 +0000 (13:44 +0900)]
Apply header review on Gallery
Change-Id: Iee337cd2ba9111e6868e5f8e210b77d822623932
Signed-off-by: JongwooLee <jongwoo718.lee@samsung.com>
Keuckdo Bang [Mon, 22 Apr 2013 04:42:00 +0000 (13:42 +0900)]
Apply reviewed header files.
Change-Id: I5df382696f622e044c095fb726d8d606ddf94aab
Park Kyoung Hee [Mon, 22 Apr 2013 04:19:48 +0000 (13:19 +0900)]
apply header review on Panel, ScrollPanel
Change-Id: I570d1aee58323b2f727e8f994def5ba764c4b52c
Signed-off-by: Park Kyoung Hee <kh1979.park@samsung.com>
Chulheon [Mon, 22 Apr 2013 04:31:31 +0000 (13:31 +0900)]
Merge "apply header review" into tizen_2.1
Chulheon [Mon, 22 Apr 2013 04:23:25 +0000 (13:23 +0900)]
apply header review
Change-Id: I42d1d10e1929538a3b8486e79901d95217f43867
clone [Mon, 22 Apr 2013 04:25:41 +0000 (13:25 +0900)]
Reflected review on public headers.
Change-Id: I0677c3e26b28c89a8b65cd1e3f2890fd914b284d
Signed-off-by: clone <ingyou.park@samsung.com>
projects / platform / framework / native / uifw.git / log