From: yonghwan82.jeon Date: Thu, 15 May 2014 06:23:22 +0000 (+0900) Subject: Merge remote-tracking branch 'origin/tizen' into mw X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F21104%2F1;p=sdk%2Fide%2Fweb-ui-builder-eplugin.git 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 --- 374938946c1ad3128ce5ce14814072e1b70a383f