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>
Changyeon Lee [Wed, 14 May 2014 08:03:31 +0000 (01:03 -0700)]
Merge "UIB : add viewport width param" into develop
Changyeon Lee [Wed, 14 May 2014 08:03:21 +0000 (01:03 -0700)]
Merge "DATABIND: Displays the binding info in the view model panel" into develop
Changyeon Lee [Wed, 14 May 2014 08:03:05 +0000 (01:03 -0700)]
Merge "NSCREEN : Modify NscreenDescriptor. Modify Nscreen Data and Remove unused data." into develop
gyeongmin.ju [Wed, 14 May 2014 07:05:47 +0000 (16:05 +0900)]
UIB : add viewport width param
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I481e3dedd433db5cc6d044e938807435ea63027e
jinwooim.bae [Wed, 14 May 2014 04:43:32 +0000 (13:43 +0900)]
ANIMATOR : Refresh globalActionbar
This is refreshing globarActionBar when operated other actions.
Change-Id: I9bfa3435f210c380fec9d75cc0563acd9d4d4b8c
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 05:03:29 +0000 (14:03 +0900)]
NSCREEN : Modify NscreenDescriptor.
Modify Nscreen Data and Remove unused data.
Change-Id: Idc2508c81db1b5d72f7d786183046a7412e95bc1
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jaeyeol lee [Wed, 14 May 2014 05:06:57 +0000 (14:06 +0900)]
DATABIND: Displays the binding info in the view model panel
Change-Id: I813ee0c44a72539b8635a92239c7fb03d92d47f5
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Wed, 14 May 2014 04:22:19 +0000 (21:22 -0700)]
Merge "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." into develop
Changyeon Lee [Wed, 14 May 2014 04:22:04 +0000 (21:22 -0700)]
Merge "ANIMATOR : Modify Filter The timelineview is refreshed if click filter button or other action." into develop
jooyoul_lee [Wed, 14 May 2014 04:13:43 +0000 (13:13 +0900)]
NSCREEN : nscreen group folding enabled
nscreen group folding feature added
Change-Id: I45559a8353416843d41d0fdb7a609e6979c9ddbd
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
jooyoul_lee [Wed, 14 May 2014 03:43:25 +0000 (12:43 +0900)]
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)
Change-Id: I26c23986583d3cb6a3f55816f9db32535b68db9a
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
changhyun1.lee [Wed, 14 May 2014 03:08:11 +0000 (12:08 +0900)]
MISC: package version up(0.1.428)
Change-Id: I69a76c082b0dd0de2bbdc53122f0a5b33072dd79
Signed-off-by: changhyun1.lee <changhyun1.lee@samsung.com>
changhyun1.lee [Wed, 14 May 2014 03:08:11 +0000 (12:08 +0900)]
MISC: package version up(0.1.428)
Change-Id: I69a76c082b0dd0de2bbdc53122f0a5b33072dd79
Signed-off-by: changhyun1.lee <changhyun1.lee@samsung.com>
(cherry picked from commit
afce25847e54390d3512e625576f3f03b05c2b81)
changhyun1.lee [Wed, 14 May 2014 03:04:10 +0000 (12:04 +0900)]
CONFIGURATION: Changed configuration model package name
Change-Id: Ifd08244534dba5220c51fcaebc590040b09db428
Signed-off-by: changhyun1.lee <changhyun1.lee@samsung.com>
changhyun1.lee [Wed, 14 May 2014 03:04:10 +0000 (12:04 +0900)]
CONFIGURATION: Changed configuration model package name
Change-Id: Ifd08244534dba5220c51fcaebc590040b09db428
Signed-off-by: changhyun1.lee <changhyun1.lee@samsung.com>
(cherry picked from commit
44c044b6bf575aea69a6ed7b65b315db7b956fb4)
jinwooim.bae [Wed, 14 May 2014 01:13:28 +0000 (10:13 +0900)]
ANIMATOR : Modify Filter
The timelineview is refreshed if click filter button or other action.
Change-Id: I2391d5848a145c85d4ce68366811d311f2fc1556
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
youngduk.hwang [Tue, 13 May 2014 14:41:23 +0000 (23:41 +0900)]
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.
Change-Id: I25d7b8a5372e76937929a92a25b40b16caa285fd
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
Changyeon Lee [Tue, 13 May 2014 11:25:03 +0000 (04:25 -0700)]
Merge "PROP : Add display style." into develop
Changyeon Lee [Tue, 13 May 2014 11:07:44 +0000 (04:07 -0700)]
Merge "ANIMATOR : remove NPE" into develop
nakyoung2.choi [Tue, 13 May 2014 10:53:11 +0000 (19:53 +0900)]
PROP : Add display style.
Change-Id: I432227a9a3a344180ba59bc16d94ae72d44efcbc
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
gyeongmin.ju [Tue, 13 May 2014 10:19:12 +0000 (19:19 +0900)]
ANIMATOR : remove NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I8f453d49ef854adfd8393426f77b191433cde666
jaeyeol lee [Tue, 13 May 2014 06:53:40 +0000 (15:53 +0900)]
DATABIND: modify the rename rule in the data source panel
Change-Id: Ic2d91d2f9a69eeb6ad3ca7831aa32c9c799f04db
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Tue, 13 May 2014 06:49:42 +0000 (15:49 +0900)]
PROP: Bug fix the custom event in the action tab
save, refresh fixed
Change-Id: I964bc5650f537d006f67691c9117640933296056
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Tue, 13 May 2014 06:23:45 +0000 (23:23 -0700)]
Merge "ANIMATOR : Bug fix for predefined animation property apply If there is a keyframe that is empty and then predefined animation positioned fater that predefined animation does not apply computed properties" into develop
seongwon.shim [Tue, 13 May 2014 03:16:12 +0000 (12:16 +0900)]
ANIMATOR : Bug fix for predefined animation property apply
If there is a keyframe that is empty and then predefined animation positioned fater that predefined animation does not apply computed properties
Change-Id: Iada1b4ee07c49cc3f89e5e6ab8d7ed8d95b32d22
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Tue, 13 May 2014 02:52:19 +0000 (19:52 -0700)]
Merge "UIB : fix absolute position change plablem" into develop
gyeongmin.ju [Tue, 13 May 2014 02:52:01 +0000 (11:52 +0900)]
UIB : fix absolute position change plablem
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I1f37901d08f0e7a8f2112bbb19c1de385a912099
Changyeon Lee [Tue, 13 May 2014 02:03:50 +0000 (19:03 -0700)]
Merge "NSCREEN : css selector apply bug fix fix css file set bug." into develop
jooyoul_lee [Tue, 13 May 2014 02:01:02 +0000 (11:01 +0900)]
NSCREEN : css selector apply bug fix
fix css file set bug.
Change-Id: I89f14d43d6188a361fbc92778a13f58ab06ad231
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
jinwooim.bae [Tue, 13 May 2014 01:27:49 +0000 (10:27 +0900)]
ANIMATOR : Refresh ease box
This is refreshing ease box when select keyframe.
Change-Id: I19df0f4677c0ca866c6f5f1cc27915096febf83d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 16:33:31 +0000 (01:33 +0900)]
UIBUILDER : merge tizen branch
Change-Id: If6e00e7db6463dc0520c1620b5cbb4269c0c8857
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 16:28:58 +0000 (01:28 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen: (34 commits)
NSCREEN :merge nscreen
Merge remote-tracking branch 'origin/nscreen' into develop
Merge remote-tracking branch 'origin/develop' into nscreen
NSCREEN : cssfile loader added cssfile loading added
PROP : Fix color picker method. And fix "modifyStyle" API.
UIB : fix west & noth direction resize
NSCREEN : remove unused code. remove unused code.
NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
ANIMATOR : Refresh TimelinePage This is refreshing timeline when change page.
UIB : rename Part.getPosition to Part.getPositionProperty
UIB : add resize command
ANIMATOR : Add messages using the timeline This is message using the timeline.
NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
ANIMATOR : Implements cut, copy, paste Implements Animation cut, copy, paste
NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
ANIMATOR : Fixed animator initialization This is fixing animator initialization.
ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication.
NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
...
Conflicts:
package/changelog
Change-Id: Ib190597bbb36da3e75071921d1389d0edaf39029
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 16:26:07 +0000 (01:26 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop: (34 commits)
NSCREEN :merge nscreen
Merge remote-tracking branch 'origin/nscreen' into develop
Merge remote-tracking branch 'origin/develop' into nscreen
NSCREEN : cssfile loader added cssfile loading added
PROP : Fix color picker method. And fix "modifyStyle" API.
UIB : fix west & noth direction resize
NSCREEN : remove unused code. remove unused code.
NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
ANIMATOR : Refresh TimelinePage This is refreshing timeline when change page.
UIB : rename Part.getPosition to Part.getPositionProperty
UIB : add resize command
ANIMATOR : Add messages using the timeline This is message using the timeline.
NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
ANIMATOR : Implements cut, copy, paste Implements Animation cut, copy, paste
NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
ANIMATOR : Fixed animator initialization This is fixing animator initialization.
ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication.
NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
...
Conflicts:
package/changelog
Change-Id: If91d38dae2a4d6566d44d62c0c930d1096e802fa
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 16:20:12 +0000 (01:20 +0900)]
NSCREEN :merge nscreen
Change-Id: Ia25f481956a3d31a8cc611c4cdd47c106c0aa683
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 12 May 2014 16:03:21 +0000 (09:03 -0700)]
Merge "Merge remote-tracking branch 'origin/nscreen' into develop" into nscreen
yonghwan82.jeon [Mon, 12 May 2014 16:02:28 +0000 (01:02 +0900)]
Merge remote-tracking branch 'origin/nscreen' into develop
* origin/nscreen: (23 commits)
Merge remote-tracking branch 'origin/develop' into nscreen
NSCREEN : cssfile loader added cssfile loading added
NSCREEN : remove unused code. remove unused code.
NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
Nscreen: Add Fields in NscreenModel. It was meaning that allowed menu in Nscreen View.
NSCREEN : Add device and deviceManager add Real device info and deviceManager
NSCREEN: move initializion of nscreenModel. If index.meta.xml file is net exist, uibuilder initialize nscreen model. If index.meta.xml file is exist, uibuidlder read this.
NSCREEN : Modify XSLT by new NScreenModel.
NSCREEN : Remove unused function and Modify NscreenLisitItem. remove printNscreenModel and modify NscreenListItem.
NSCREEN : initialize nscreenmodel. initialize nscreenmodel.
NSCREEN : add nscreenmodel controller. when page added, nscreen item add page info. nscreen controller add nscreen item for page info.
NScreen : add Common nscreen. addCommonNscreen() in Appmanger.
NSCREEN : Modify nscreen model. add attribute ( link, EnabePages, devicePixelRatio ). Remove attribute (Prefix min,max attribute).
NSCREEN : Change path for Nscreen model. Change path for Nscreen model.
NSCREEN : Modify N-Screen model scope. page - > application.
...
Change-Id: Ic5ca93f769f0585532aec93565392c884ad7494f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 15:36:18 +0000 (00:36 +0900)]
Merge remote-tracking branch 'origin/develop' into nscreen
* origin/develop:
PROP : Fix color picker method. And fix "modifyStyle" API.
UIB : fix west & noth direction resize
Change-Id: I289fe0958f53c762ee82b756712604f984c00671
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Mon, 12 May 2014 15:29:45 +0000 (00:29 +0900)]
NSCREEN : cssfile loader added
cssfile loading added
Change-Id: I13234833e921676872996d8626507972015a2f13
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
nakyoung2.choi [Mon, 12 May 2014 14:36:04 +0000 (23:36 +0900)]
PROP : Fix color picker method. And fix "modifyStyle" API.
Change-Id: I66652de15a4aa9e2eb316401008761bf901a8e3d
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
gyeongmin.ju [Mon, 12 May 2014 13:10:23 +0000 (22:10 +0900)]
UIB : fix west & noth direction resize
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I553f0d94b9a6d09414af2d68477d11ca3a037245
yonghwan82.jeon [Mon, 12 May 2014 12:56:55 +0000 (21:56 +0900)]
Merge remote-tracking branch 'origin/develop' into nscreen2
* origin/develop:
ANIMATOR : Refresh TimelinePage This is refreshing timeline when change page.
UIB : rename Part.getPosition to Part.getPositionProperty
UIB : add resize command
ANIMATOR : Add messages using the timeline This is message using the timeline.
ANIMATOR : Implements cut, copy, paste Implements Animation cut, copy, paste
ANIMATOR : Fixed animator initialization This is fixing animator initialization.
ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication.
PAGES: Fixed page's id mismatch A page name is consist of integer when a page is added, page id mismath occurs
PAGES: Apply synchronization between pages view and properties view properties view is changed to the page's When a user click a page in pages view
UIB : remove NPE
ANIMATOR : Add KeyHandler This is keyhandler for action in timeline.
UIB : Add Absolute Position shotcut
ANIMATOR : ADD copy,cut and paste in timeline This is copy, cut and paste fuction in timeline.
DATABIND: Modify the rename in the view model panel
ANIMATOR : Add Timeline Actions This is adding Actions in timeline and ContextMenu.
DATABIND: Add the binding property for a list item
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
Change-Id: I282aa643bccc177babdf6b0496ac12454916440d
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 12 May 2014 12:37:51 +0000 (05:37 -0700)]
Merge "NSCREEN : remove unused code. remove unused code." into nscreen
yonghwan82.jeon [Mon, 12 May 2014 12:08:58 +0000 (21:08 +0900)]
NSCREEN : remove unused code.
remove unused code.
Change-Id: I6b2467c5682fc633a15741439872eb3dcf2117ab
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Mon, 12 May 2014 11:58:46 +0000 (20:58 +0900)]
NSCREEN : Old nscreen source delete
NScreenList, NScreenListItem class delete
Change-Id: I6b9b4b653047d8f0d22d7c3aec6d30226bbc68ae
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 11:30:09 +0000 (20:30 +0900)]
UIBUILDER : Merge tizen branch.
Merge tizen branch.
Change-Id: I43068727ad12192cfe126a97cc3968acdb752ce3
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Mon, 12 May 2014 11:24:35 +0000 (20:24 +0900)]
NSCREEN : NScreen view implement update
NScreen view contents changed
NScreen view action changed
Nscreen icons added
Change-Id: Ic7d7ec601b8acba2ab51aaae3db6321fd191270f
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
jinwooim.bae [Mon, 12 May 2014 11:00:55 +0000 (20:00 +0900)]
ANIMATOR : Refresh TimelinePage
This is refreshing timeline when change page.
Change-Id: If36d72b9ea12dff3f9b3343470d1db7d566738f5
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
gyeongmin.ju [Mon, 12 May 2014 10:59:44 +0000 (19:59 +0900)]
UIB : rename Part.getPosition to Part.getPositionProperty
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ib06d3e53aea2f88dd7d5fe59fb2fc4c78790c4a5
Changyeon Lee [Mon, 12 May 2014 10:22:00 +0000 (03:22 -0700)]
Merge changes I96f47f04,I1d08120a into develop
* changes:
ANIMATOR : Add messages using the timeline This is message using the timeline.
ANIMATOR : Fixed animator initialization This is fixing animator initialization.
Changyeon Lee [Mon, 12 May 2014 10:21:44 +0000 (03:21 -0700)]
Merge "ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication." into develop
Changyeon Lee [Mon, 12 May 2014 10:21:27 +0000 (03:21 -0700)]
Merge "UIB : add resize command" into develop
gyeongmin.ju [Mon, 12 May 2014 09:21:46 +0000 (18:21 +0900)]
UIB : add resize command
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I6a7ffe66b0153b6899f4e21c42cc7a8e94c85dd5
jinwooim.bae [Mon, 12 May 2014 08:01:31 +0000 (17:01 +0900)]
ANIMATOR : Add messages using the timeline
This is message using the timeline.
Change-Id: I96f47f044985aafdfd1dbe03689edd1376375917
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 09:02:36 +0000 (18:02 +0900)]
NSCREEN : Modify meta reader&writer.
Modify meta reader and writer for Nscreen view menu info.
Change-Id: I771a3c0d6ccd3b6dbbe4d7ea63a165a488a05acf
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Mon, 12 May 2014 08:50:18 +0000 (17:50 +0900)]
ANIMATOR : Implements cut, copy, paste
Implements Animation cut, copy, paste
Change-Id: Ifa52e9ff1bcd02f36232af89a311226f8092f43a
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jaeyeol lee [Mon, 12 May 2014 08:34:25 +0000 (17:34 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop: (51 commits)
PAGES: Fixed page's id mismatch A page name is consist of integer when a page is added, page id mismath occurs
PAGES: Apply synchronization between pages view and properties view properties view is changed to the page's When a user click a page in pages view
UIB : remove NPE
ANIMATOR : Add KeyHandler This is keyhandler for action in timeline.
UIB : Add Absolute Position shotcut
ANIMATOR : ADD copy,cut and paste in timeline This is copy, cut and paste fuction in timeline.
DATABIND: Modify the rename in the view model panel
ANIMATOR : Add Timeline Actions This is adding Actions in timeline and ContextMenu.
DATABIND: Add the binding property for a list item
ANIMATOR : Remove unused source code Remove decrease id call and id related source code from AnimatorModelManager
DATABIND : support multi binding in the widget
ANIMATOR : Change model change method in commands Just change specific property that is manipulated in commands which access to Animator model
DATABIND : XML type file Support(Static Source/File System Source).
PROP : Fix select CSSSelector when new CSSSelector created. When new CSSSelector created, select the new CSSSelector on CSSSelector category.
ResourcesView : 1. Modify selection condition 2. Modify import file (using Job (thread) for progress monitor)
UIB : Modify deprecated API
PROP : Fix expansion function of CSS Selector Category.
PROP : Add validate routine in Metrics.
ANIMATOR : Check duplication animationgroup name This will check for duplicate animationgroup names.
ANIMATOR : Add Filter This is a timeline that shows the treeItem is just contain animations.
...
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
Change-Id: Idd35d1c05396298652661eaff451297974a45453
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 08:05:42 +0000 (17:05 +0900)]
NSCREEN: Make nscreenModelManager.
Make nscreenModelManger.
Change-Id: I83a5eb5d8f5664cff67f2a0a96f69776a0176dd6
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jinwooim.bae [Mon, 12 May 2014 05:28:41 +0000 (14:28 +0900)]
ANIMATOR : Fixed animator initialization
This is fixing animator initialization.
Change-Id: I1d08120afd4222ac899bae1821c5ee1b3f96d2f9
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
projects / sdk / ide / web-ui-builder-eplugin.git / log