yonghwan82.jeon [Mon, 19 May 2014 09:52:50 +0000 (18:52 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
DESIGNER : code refactoring
DATABIND: Modify the width of the set target dialog
DATABIND : add the icon in the databinding view
DATABIND: modify the rename functions
Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod.
ANIMATOR : Get default property value from CSSProperties.xml
ANIMATOR : Change TreeItem Height Changing for treeItem height size and multiplatform.
PAGES: Add Delete Page action to delete pages on Pages view. Modified flow of adding pages and deleting pages while Delete Page action is added.
Change-Id: Ifd9ce88c5ef62807d920df4cf55c8ec31d56bf52
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 03:40:08 +0000 (12:40 +0900)]
UIB : It is re-add the missing page.
Change-Id: Iffb1d45f8e34df9ca7ab71cea88fc51b389b7c37
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 03:26:32 +0000 (12:26 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
DESIGNER : move/resize unit to be changed 10 -> 3
DESIGNER : move/resize unit to be changed 10 -> 3
PROP : fix, when edit the CSS, NPE occurs intermittently
UIB : Fix NPE.
UIB : Remove duplicate code. When Web IDE perspective create, pages view created two views.
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
Change-Id: Iaf7f5fe219ac3b50c26feabdda0adbc3c58365c4
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
gyeongmin.ju [Mon, 19 May 2014 01:32:13 +0000 (10:32 +0900)]
DESIGNER : move/resize unit to be changed 10 -> 3
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I21e66a30c6f00fb17a38506dbd884c747f222f37
gyeongmin.ju [Mon, 19 May 2014 01:21:04 +0000 (10:21 +0900)]
DESIGNER : move/resize unit to be changed 10 -> 3
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Iba80b7ef43f8ddbae87401acca629b3e74627f2b
Changyeon Lee [Sun, 18 May 2014 11:22:21 +0000 (04:22 -0700)]
Merge "UIB : Fix NPE." into develop
gyeongmin.ju [Sun, 18 May 2014 11:22:22 +0000 (20:22 +0900)]
PROP : fix, when edit the CSS, NPE occurs intermittently
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Idd9e1648814474a4a0c13ea4d40294e3655ddf5d
nakyoung2.choi [Sun, 18 May 2014 11:19:29 +0000 (20:19 +0900)]
UIB : Fix NPE.
Change-Id: I23ddb08e657599bcbe6e8e0f4714e4bb1d045610
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 16:18:04 +0000 (01:18 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Remove duplicate code. When Web IDE perspective create, pages view created two views.
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Change-Id: I9eec8c0479e4edc988bbb7f23a0daf21fd58bb6b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 16:06:03 +0000 (01:06 +0900)]
UIB : Remove duplicate code.
When Web IDE perspective create, pages view created two views.
Change-Id: I8c18cb6fb44341d4c81862185c4e54c3ae9e8e22
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:46:03 +0000 (00:46 +0900)]
UIB : Update version.
Change-Id: I4e64a0a21644770ab335b5f2cf09579f5cf98ed4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:39:41 +0000 (00:39 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Change-Id: Ib36cc975306ee8049ad5031b4add2473e9b72fe5
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:30:17 +0000 (00:30 +0900)]
UIB : Fix CssSelector managing on Part.
Change-Id: Id3d78f1f51a34375a238341f52152ab9dc447304
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jooyoul_lee [Fri, 16 May 2014 14:59:54 +0000 (23:59 +0900)]
NSCREEN : file io changed
create file -> using File to IFile
Change-Id: I19d0fabe0ee310b5dc5f12e9181583bb7a296fe0
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 11:40:13 +0000 (20:40 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Modify QT library path. Modify QT library path for MACOS.
DATABIND: Add a setTarget Dialog
UIB : Remove InjectorView dependency
Merge remote-tracking branch 'origin/tizen' into develop
NSCREEN : fix new project exception bug 1. fix new projet bug 2. fix chagall conventions 3. other profile device set default (mobile)
DATABIND : update the descriptors a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets c. add attr[src] binding for the image and thumbnail widget d. add slider binding for the slider widget
DATABIND : add value binding for the datetimepicker widget a. update the datetimepicker despriptor b. add value binding
ANIMATOR : Modify Z-order keyframe Show z-order MenuItem When you click timelineElement that has same time keyframeUnits
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: Ifd0df1ad13804336a75f51e510155242bc6f80d2
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 11:31:08 +0000 (04:31 -0700)]
Merge "UIB : Modify QT library path. Modify QT library path for MACOS." into develop
Changyeon Lee [Fri, 16 May 2014 11:30:59 +0000 (04:30 -0700)]
Merge "DATABIND: Add a setTarget Dialog" into develop
yonghwan82.jeon [Fri, 16 May 2014 11:24:18 +0000 (20:24 +0900)]
UIB : Modify QT library path.
Modify QT library path for MACOS.
Change-Id: Ia896f238cf71e5dea91a912910275c09660fa07b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 10:36:12 +0000 (03:36 -0700)]
Merge "ANIMATOR : Modify Z-order keyframe Show z-order MenuItem When you click timelineElement that has same time keyframeUnits" into develop
jaeyeol lee [Fri, 16 May 2014 08:25:49 +0000 (17:25 +0900)]
DATABIND: Add a setTarget Dialog
Change-Id: Ie88e701ac2a270c91af7b09e5a5037c6ed3e5947
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Fri, 16 May 2014 08:13:50 +0000 (01:13 -0700)]
Merge "DATABIND : update the descriptors a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets c. add attr[src] binding for the image and thumbnail widget d. add slider binding for the slider widget" into develop
Changyeon Lee [Fri, 16 May 2014 08:13:34 +0000 (01:13 -0700)]
Merge "DATABIND : add value binding for the datetimepicker widget a. update the datetimepicker despriptor b. add value binding" into develop
jeonghwan kim [Fri, 16 May 2014 08:10:09 +0000 (17:10 +0900)]
UIB : Remove InjectorView dependency
Change-Id: I956e82e7916c2b63fc185ac93a48eb55a6d83c7b
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:10:38 +0000 (16:10 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
Change-Id: I5d612644fcac4a1a7f59e1ae6c9ee48e8daa2db5
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:05:18 +0000 (16:05 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
Change-Id: I0289843f99efff752a609ce39f453cfb4523bd58
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Fri, 16 May 2014 06:56:57 +0000 (15:56 +0900)]
NSCREEN : fix new project exception bug
1. fix new projet bug
2. fix chagall conventions
3. other profile device set default (mobile)
Change-Id: Iefe64ea38e793fb2a6637ed6c07c51a6b414fa5b
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:52:37 +0000 (15:52 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
NSCREEN: FIXED device info.
DESIGNER : fix scrollbar range
NSCREEN : Remove width&height in Device and Modify Nscreen Model. Remove width & Height in Device and Modify Nscreen Model.
NSCREEN : initial style apply bug fixed start time css style applied
NSCREEN : fixed bug(Recovery nscreenModel). When soucre mode edited, NscreenModel is not pefect recvering. It is fiexed.
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
NSCREEN : start up view port bug fix view port size problem fixed
DESIGNER : add undo shortcut
Merge remote-tracking branch 'origin/tizen' into develop
Merge remote-tracking branch 'origin/mw' into tizen
PROP : Fix setValue of SizeMethod.
Merge remote-tracking branch 'origin/develop' into tizen
UIB : fix width/height func on JS
ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter.
ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
Change-Id: I5834cfe387ee693d5e1f6cad2e494bd5d0ff3294
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:50:21 +0000 (15:50 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN: FIXED device info.
DESIGNER : fix scrollbar range
NSCREEN : Remove width&height in Device and Modify Nscreen Model. Remove width & Height in Device and Modify Nscreen Model.
NSCREEN : initial style apply bug fixed start time css style applied
NSCREEN : fixed bug(Recovery nscreenModel). When soucre mode edited, NscreenModel is not pefect recvering. It is fiexed.
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
NSCREEN : start up view port bug fix view port size problem fixed
DESIGNER : add undo shortcut
Merge remote-tracking branch 'origin/tizen' into develop
PROP : Fix setValue of SizeMethod.
UIB : fix width/height func on JS
ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter.
ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
Change-Id: Ief54ac30f1d039110fb3dab0e5fbbae71da7f535
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 06:01:48 +0000 (15:01 +0900)]
DATABIND : update the descriptors
a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java
b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets
c. add attr[src] binding for the image and thumbnail widget
d. add slider binding for the slider widget
Change-Id: Ibe90127afa8969db3659b52a6c0392c2c57460e5
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:56:14 +0000 (11:56 +0900)]
DATABIND : add value binding for the datetimepicker widget
a. update the datetimepicker despriptor
b. add value binding
Change-Id: Ie02eeb96c32be2c533e3a19a497d44e6ad29f735
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 05:29:04 +0000 (14:29 +0900)]
NSCREEN: FIXED device info.
Change-Id: I559f04997fb5e2f97a480be7e57a6940516c8365
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 05:16:22 +0000 (22:16 -0700)]
Merge "NSCREEN : initial style apply bug fixed start time css style applied" into develop
jinwooim.bae [Fri, 16 May 2014 04:52:02 +0000 (13:52 +0900)]
ANIMATOR : Modify Z-order keyframe
Show z-order MenuItem When you click timelineElement that has same time
keyframeUnits
Change-Id: Ib9a3218a191b66365e49a67313591bc7465ad04a
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Fri, 16 May 2014 04:47:46 +0000 (21:47 -0700)]
Merge "DESIGNER : fix scrollbar range" into develop
gyeongmin.ju [Fri, 16 May 2014 04:48:03 +0000 (13:48 +0900)]
DESIGNER : fix scrollbar range
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ib40c9768f487534e8ce0c383b6c71d752ddacc04
yonghwan82.jeon [Fri, 16 May 2014 04:42:43 +0000 (13:42 +0900)]
NSCREEN : Remove width&height in Device and Modify Nscreen Model.
Remove width & Height in Device and Modify Nscreen Model.
Change-Id: Ia265c2783121ac0f11b02e03a11f8801195c49d9
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Fri, 16 May 2014 03:22:44 +0000 (12:22 +0900)]
NSCREEN : initial style apply bug fixed
start time css style applied
Change-Id: I1f962ec205918d5070a4bd8e665c3945fc457c5b
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Changyeon Lee [Fri, 16 May 2014 02:29:01 +0000 (19:29 -0700)]
Merge "DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding" into develop
yonghwan82.jeon [Fri, 16 May 2014 02:14:54 +0000 (11:14 +0900)]
NSCREEN : fixed bug(Recovery nscreenModel).
When soucre mode edited, NscreenModel is not pefect recvering.
It is fiexed.
Change-Id: Iecd8e6ad3a9b30fb92d975597596be82cacad81f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:12:08 +0000 (11:12 +0900)]
DATABIND : add text binding for the submit button widget
a. update the submit button descriptor
b. add text binding
Change-Id: Ic429ddac1d837ef5225384f5ac7793b4553d073e
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Fri, 16 May 2014 01:53:54 +0000 (18:53 -0700)]
Merge "NSCREEN : start up view port bug fix view port size problem fixed" into develop
jooyoul_lee [Fri, 16 May 2014 01:52:18 +0000 (10:52 +0900)]
NSCREEN : start up view port bug fix
view port size problem fixed
Change-Id: Ie2399c7c04af8b554688a00a347242939a33ba72
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
gyeongmin.ju [Fri, 16 May 2014 01:52:07 +0000 (10:52 +0900)]
DESIGNER : add undo shortcut
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Iaf423215d2cd7fe89c71afcf4ae7d9ba784a0831
yonghwan82.jeon [Thu, 15 May 2014 10:54:23 +0000 (19:54 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
Change-Id: I8fcaef0e1fcaa14c7de9166d62e1f5ccd6d22f76
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:51:14 +0000 (19:51 +0900)]
Merge remote-tracking branch 'origin/mw' into tizen
* origin/mw:
Merge remote-tracking branch 'origin/tizen' into mw
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
UIBUILDER : Merge tizen branch. Merge tizen branch.
Change-Id: Ie67c0d6a4d6ffac35693a0e8a762b38952a109c8
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:45:07 +0000 (19:45 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
Change-Id: Ia460cd96298531cf992e6a9dbe0820dee4d120a0
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 15 May 2014 10:41:10 +0000 (03:41 -0700)]
Merge "ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties" into develop
Changyeon Lee [Thu, 15 May 2014 10:41:00 +0000 (03:41 -0700)]
Merge "ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter." into develop
Changyeon Lee [Thu, 15 May 2014 10:40:50 +0000 (03:40 -0700)]
Merge "PROP : Fix setValue of SizeMethod." into develop
nakyoung2.choi [Thu, 15 May 2014 10:35:48 +0000 (19:35 +0900)]
PROP : Fix setValue of SizeMethod.
Change-Id: I73c86234e89d52243b77ce16ca81318f420c0463
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:34:38 +0000 (19:34 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Change-Id: Icc95346952bc078e325edf38f72117d80aea3ba8
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
gyeongmin.ju [Thu, 15 May 2014 10:34:33 +0000 (19:34 +0900)]
UIB : fix width/height func on JS
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Id5c0fd8e99b15b109ad8e275ca2dbb1c9ca6ce72
jinwooim.bae [Thu, 15 May 2014 10:26:06 +0000 (19:26 +0900)]
ANIMATOR : Refresh ContextMenu
ContextMenu is refreshed when clicked filter.
Change-Id: If063a65e638f9fc37befce221ccb4043c18cf210
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Thu, 15 May 2014 08:16:57 +0000 (17:16 +0900)]
ANIMATOR : Bug fix for merge/split keyframe
If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split,
Only customKeyframe will be merged or splited or keyframes are not put on
upon another keyframe and have different properties
Change-Id: I82d6e2f4db6270f334c5bf5bfff2eaa29841fbe5
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Thu, 15 May 2014 08:31:45 +0000 (01:31 -0700)]
Merge "NSCREEN : default device changed profile default device added common feature history added" into develop
jooyoul_lee [Thu, 15 May 2014 08:29:25 +0000 (17:29 +0900)]
NSCREEN : default device changed
profile default device added
common feature history added
Change-Id: I90db96df13bd4b5d9aa6b4f77e7bbd1cfae20657
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
nakyoung2.choi [Thu, 15 May 2014 07:50:22 +0000 (16:50 +0900)]
PROP : Fix display size text when value modified.
Change-Id: Ib834aec98c47c7d84479286f451fe966bcb9b4fc
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 15 May 2014 06:45:33 +0000 (15:45 +0900)]
PROP : Add modify function in Transform. And add increment to SizeMethod.
Change-Id: I287944ed35d0729c8df7f32953d111f5872e8060
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 06:23:22 +0000 (15:23 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
NSCREEN : change device name. Change device Name in PageDesigner.
NSCREEN : remove orientation in NscreenView. remove orientation in NscreenView.
UIB : Update index.managed.js.xslt for widget does not have id.
NSCREEN : fixed bug for managed.css. Modify page_managed_css file.
NSCREEN : Modify devceice info. Modify device Name in DeviceManger.
UIB : ProjectManger add getPlatform(). getPlatform get Platform Info.
MODEL : fix position method
EDITOR : change selector border width
EDITOR : change selector border color
UIB : fix NPE
UIB : setDefaultEditorForIndexHtmlFile() move to function of doAfter() in projectTemplateContributor. It set the defulat editor for the index.html. It move to doAfter().
NSCREEN : nscreen features left align nscreen feature names and group names -> left align
ANIMATOR : Optimizing the filter The function of the filter is improved.
PROP : Advance performance about widget move.
Merge remote-tracking branch 'origin/mw' into develop
MODEL : Fix feedback width/height for size adjustment.
PAGES: Fixed undo action about adding a page Fixed the problem which the page remains on other views when a page is deleted by undo
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: Id508a603055cee89cfeb2397e6bc9fdba6e0cd5a
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 06:18:33 +0000 (15:18 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN : change device name. Change device Name in PageDesigner.
NSCREEN : remove orientation in NscreenView. remove orientation in NscreenView.
UIB : Update index.managed.js.xslt for widget does not have id.
NSCREEN : fixed bug for managed.css. Modify page_managed_css file.
NSCREEN : Modify devceice info. Modify device Name in DeviceManger.
UIB : ProjectManger add getPlatform(). getPlatform get Platform Info.
MODEL : fix position method
EDITOR : change selector border width
EDITOR : change selector border color
UIB : fix NPE
UIB : setDefaultEditorForIndexHtmlFile() move to function of doAfter() in projectTemplateContributor. It set the defulat editor for the index.html. It move to doAfter().
NSCREEN : nscreen features left align nscreen feature names and group names -> left align
ANIMATOR : Optimizing the filter The function of the filter is improved.
PROP : Advance performance about widget move.
Merge remote-tracking branch 'origin/mw' into develop
MODEL : Fix feedback width/height for size adjustment.
PAGES: Fixed undo action about adding a page Fixed the problem which the page remains on other views when a page is deleted by undo
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: I9ed70c340907da82130d97dc7e4233ea07b35101
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 06:12:19 +0000 (15:12 +0900)]
NSCREEN : change device name.
Change device Name in PageDesigner.
Change-Id: Ia4114bbb1cad918c14b7db1036e2913feffaee50
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 05:33:13 +0000 (14:33 +0900)]
NSCREEN : remove orientation in NscreenView.
remove orientation in NscreenView.
Change-Id: I69e3500086a54b494bab2dd5b231cce44aaaee93
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Thu, 15 May 2014 04:39:54 +0000 (13:39 +0900)]
UIB : Update index.managed.js.xslt for widget does not have id.
Change-Id: I696974a0ecc4826afe57cb5bbde27f44f65fb5c0
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 04:17:43 +0000 (13:17 +0900)]
NSCREEN : fixed bug for managed.css.
Modify page_managed_css file.
Change-Id: Iee671469bfb285c7645a4c713966e58117689055
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 03:57:29 +0000 (12:57 +0900)]
NSCREEN : Modify devceice info.
Modify device Name in DeviceManger.
Change-Id: I654996836b6e3381125548be003887cf1a68e395
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 15 May 2014 03:43:50 +0000 (20:43 -0700)]
Merge "UIB : ProjectManger add getPlatform(). getPlatform get Platform Info." into develop
yonghwan82.jeon [Thu, 15 May 2014 03:43:24 +0000 (12:43 +0900)]
UIB : ProjectManger add getPlatform().
getPlatform get Platform Info.
Change-Id: I2cfc1138923876e603439af1db5a747530eb117f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
gyeongmin.ju [Thu, 15 May 2014 03:19:10 +0000 (12:19 +0900)]
MODEL : fix position method
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I80abe53ebb2652badb3e6f5b8b9f7e98d912d6fa
Changyeon Lee [Thu, 15 May 2014 03:05:02 +0000 (20:05 -0700)]
Merge "EDITOR : change selector border width" into develop
gyeongmin.ju [Thu, 15 May 2014 03:04:10 +0000 (12:04 +0900)]
EDITOR : change selector border width
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ifb3a615f4f7be2e2a993089f508997d7457b1073
Changyeon Lee [Thu, 15 May 2014 02:58:09 +0000 (19:58 -0700)]
Merge "UIB : setDefaultEditorForIndexHtmlFile() move to function of doAfter() in projectTemplateContributor. It set the defulat editor for the index.html. It move to doAfter()." into develop
Changyeon Lee [Thu, 15 May 2014 02:57:52 +0000 (19:57 -0700)]
Merge "EDITOR : change selector border color" into develop
Changyeon Lee [Thu, 15 May 2014 02:57:39 +0000 (19:57 -0700)]
Merge "UIB : fix NPE" into develop
Changyeon Lee [Thu, 15 May 2014 02:57:28 +0000 (19:57 -0700)]
Merge "ANIMATOR : Optimizing the filter The function of the filter is improved." into develop
gyeongmin.ju [Thu, 15 May 2014 02:56:03 +0000 (11:56 +0900)]
EDITOR : change selector border color
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ia694a22b644655ea1d675adc737c5371b44b7825
gyeongmin.ju [Thu, 15 May 2014 02:02:25 +0000 (11:02 +0900)]
UIB : fix NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I4d3284bd76c42e42e7f0e1be14d085606b83cfba
yonghwan82.jeon [Thu, 15 May 2014 01:53:22 +0000 (10:53 +0900)]
UIB : setDefaultEditorForIndexHtmlFile() move to function of doAfter() in projectTemplateContributor.
It set the defulat editor for the index.html.
It move to doAfter().
Change-Id: I26b67210be5f6b6bb44bf373a7b2a446c94eadac
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 15 May 2014 01:32:29 +0000 (18:32 -0700)]
Merge "PROP : Advance performance about widget move." into develop
jooyoul_lee [Wed, 14 May 2014 13:26:50 +0000 (22:26 +0900)]
NSCREEN : nscreen features left align
nscreen feature names and group names -> left align
Change-Id: I449e147d4f267bc3f2588c8a0493169b324664d3
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
jinwooim.bae [Wed, 14 May 2014 12:58:05 +0000 (21:58 +0900)]
ANIMATOR : Optimizing the filter
The function of the filter is improved.
Change-Id: I25a609a50f20deb870d8d0e82e97a68861e1097b
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
nakyoung2.choi [Wed, 14 May 2014 12:56:14 +0000 (21:56 +0900)]
PROP : Advance performance about widget move.
Change-Id: I8b0d6f45f00a51f6004d918f9d9a731183df9ff5
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 12:07:53 +0000 (21:07 +0900)]
Merge remote-tracking branch 'origin/mw' into develop
* origin/mw:
MISC: package version up(0.1.428)
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
CONFIGURATION: Changed configuration model package name
UIBUILDER : Merge tizen branch. Merge tizen branch.
Change-Id: I0af2057cab1a985a1b934eae04596ffda173b6df
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 11:43:56 +0000 (20:43 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
Conflicts:
package/changelog
Change-Id: I5a87cc90b07160b6f688aab29e1b1cc1002cc813
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Wed, 14 May 2014 11:40:07 +0000 (04:40 -0700)]
Merge "PAGES: Fixed undo action about adding a page Fixed the problem which the page remains on other views when a page is deleted by undo" into develop
Changyeon Lee [Wed, 14 May 2014 11:35:34 +0000 (04:35 -0700)]
Merge "MODEL : Fix feedback width/height for size adjustment." into develop
yonghwan82.jeon [Wed, 14 May 2014 11:31:06 +0000 (20:31 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop: (25 commits)
NSCREEN : change group selection color, etc. 1. change group selection color and bg color 2. show enabled item count on group title. 3. view minimum size set.
NSREEN: add null check in nscreenModelManager. getNscreenModelForDevice() searched NscreenModels. return value check null.
MODEL : Update image widget descriptor.
MODEL : Fix image widget for size adjustment.
NSCREEN : fix resolution fit resolution : fit fixed
ANIMATOR : Implements merge/split keyframe Implements merge/split keyframe when keyframe is edited by user from timeline view including undo/redo
NSCREEN : Viewport setting added 1. viewport mode added 2. folding fixed
NSCREEN : remove pixel ratio in Screen feature. Remove pixel ratio in screen feature.
UIB : add viewport width param
ANIMATOR : Refresh globalActionbar This is refreshing globarActionBar when operated other actions.
NSCREEN : Modify NscreenDescriptor. Modify Nscreen Data and Remove unused data.
DATABIND: Displays the binding info in the view model panel
NSCREEN : nscreen group folding enabled nscreen group folding feature added
NSCREEN : Enable/Disable bug fixed, etc. 1. NScreen Item enable/disable bug fix (css selection bug) 2. NScreen group name added 3. NScreen Title added 4. ground.js indentation fixed 5. data-binding dialog dependency fixed (webapp-eplugin package changed)
ANIMATOR : Modify Filter The timelineview is refreshed if click filter button or other action.
PAGETEMP: Add CreatePageCommand and apply on Page template CreatePageCommand is applied when we add a new page on Pages view. Then Undo and Redo is possible.
PROP : Add display style.
ANIMATOR : remove NPE
DATABIND: modify the rename rule in the data source panel
PROP: Bug fix the custom event in the action tab
...
Conflicts:
package/changelog
Change-Id: Ie4d64e8cf64e0ca68bb50344d7cbe17faefd8310
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Wed, 14 May 2014 11:18:40 +0000 (20:18 +0900)]
MODEL : Fix feedback width/height for size adjustment.
Change-Id: I7a17509bc4385190ec7821376ed692426fd0c8a2
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jooyoul_lee [Wed, 14 May 2014 11:01:28 +0000 (20:01 +0900)]
NSCREEN : change group selection color, etc.
1. change group selection color and bg color
2. show enabled item count on group title.
3. view minimum size set.
Change-Id: I4ccad5dec21f3ceb47acde16ad3ae95522a169c6
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
youngduk.hwang [Wed, 14 May 2014 11:01:23 +0000 (20:01 +0900)]
PAGES: Fixed undo action about adding a page
Fixed the problem which the page remains on other views when a page is deleted by undo
Change-Id: I2a7a463ce09fec5c256ce5b3c8b7e25502d8a120
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
Changyeon Lee [Wed, 14 May 2014 10:53:32 +0000 (03:53 -0700)]
Merge "NSREEN: add null check in nscreenModelManager. getNscreenModelForDevice() searched NscreenModels. return value check null." into develop
Changyeon Lee [Wed, 14 May 2014 10:15:28 +0000 (03:15 -0700)]
Merge "MODEL : Update image widget descriptor." into develop
yonghwan82.jeon [Wed, 14 May 2014 10:13:47 +0000 (19:13 +0900)]
NSREEN: add null check in nscreenModelManager.
getNscreenModelForDevice() searched NscreenModels.
return value check null.
Change-Id: I5f61b325c40c8d094d69cc9954f937a85de081d7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Wed, 14 May 2014 10:09:34 +0000 (03:09 -0700)]
Merge "ANIMATOR : Implements merge/split keyframe Implements merge/split keyframe when keyframe is edited by user from timeline view including undo/redo" into develop
nakyoung2.choi [Wed, 14 May 2014 10:07:37 +0000 (19:07 +0900)]
MODEL : Update image widget descriptor.
Change-Id: I660ebf7589985e55ae1c492d9d5948c44907dfde
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Wed, 14 May 2014 09:26:21 +0000 (18:26 +0900)]
MODEL : Fix image widget for size adjustment.
Change-Id: Iaa48aaffb4708028d7024ccb8f8641056b635f88
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jooyoul_lee [Wed, 14 May 2014 09:20:01 +0000 (18:20 +0900)]
NSCREEN : fix resolution fit
resolution : fit fixed
Change-Id: Idf6a3c3c738cddaad49470334e860c2c30069d03
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
seongwon.shim [Wed, 14 May 2014 08:56:07 +0000 (17:56 +0900)]
ANIMATOR : Implements merge/split keyframe
Implements merge/split keyframe when keyframe is edited by user from timeline view including undo/redo
Change-Id: Ie4825a47310665dc1704d575066d8aecdc60ce72
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Wed, 14 May 2014 08:54:26 +0000 (01:54 -0700)]
Merge "NSCREEN : remove pixel ratio in Screen feature. Remove pixel ratio in screen feature." into develop
jooyoul_lee [Wed, 14 May 2014 08:48:59 +0000 (17:48 +0900)]
NSCREEN : Viewport setting added
1. viewport mode added
2. folding fixed
Change-Id: Idd404a5e7599ac5636cd026ebb427f51ec979a10
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 08:09:08 +0000 (17:09 +0900)]
NSCREEN : remove pixel ratio in Screen feature.
Remove pixel ratio in screen feature.
Change-Id: I95035483254964ca7d9432669d3485f743f13a60
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
projects / sdk / ide / web-ui-builder-eplugin.git / log