From: yonghwan82.jeon Date: Thu, 15 May 2014 06:18:33 +0000 (+0900) Subject: Merge remote-tracking branch 'origin/develop' into tizen X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F21102%2F1;p=sdk%2Fide%2Fweb-ui-builder-eplugin.git 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 --- 5411eed41ef7a1485445fccf89949786e423e721 diff --cc package/changelog index f7b9901,6a2e073..6f1bdb9 --- a/package/changelog +++ b/package/changelog @@@ -1,3 -1,6 +1,9 @@@ ++* 0.1.430 ++- [Title] update version ++== yonghwan.jeon 2014-05-15 + * 0.1.429 + - [Title] update version + == yonghwan.jeon 2014-05-14 * 0.1.428 - [Title] changed configuration package name == changhyun1.lee 2014-05-14 diff --cc package/pkginfo.manifest index c49de82,b8f2542..2a6eaa3 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -1,5 -1,5 +1,5 @@@ Package : web-ui-builder-eplugin - Version :0.1.428 -Version :0.1.429 ++Version :0.1.430 OS : ubuntu-32 Build-host-os : ubuntu-32 Maintainer : Hoon Kang @@@ -11,7 -11,7 +11,7 @@@ Source : web-ui-builder-eplugi Description : Package : web-ui-builder-eplugin - Version :0.1.427 -Version :0.1.429 ++Version :0.1.430 OS : ubuntu-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang @@@ -23,7 -23,7 +23,7 @@@ Source : web-ui-builder-eplugi Description : Package : web-ui-builder-eplugin - Version :0.1.427 -Version :0.1.429 ++Version :0.1.430 OS : windows-32 Build-host-os : ubuntu-32 Maintainer : Hoon Kang @@@ -35,7 -35,7 +35,7 @@@ Source : web-ui-builder-eplugi Description : Package : web-ui-builder-eplugin - Version :0.1.427 -Version :0.1.429 ++Version :0.1.430 OS : windows-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang @@@ -47,7 -47,7 +47,7 @@@ Source : web-ui-builder-eplugi Description : Package : web-ui-builder-eplugin - Version :0.1.427 -Version :0.1.429 ++Version :0.1.430 OS : macos-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang