update version and Merge remote-tracking branch 'origin/develop' into mw 54/22254/1 mw
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Fri, 30 May 2014 10:16:14 +0000 (19:16 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Fri, 30 May 2014 10:16:14 +0000 (19:16 +0900)
* origin/develop:
  PROJECTEMP : remove template. remove mobile2048.
  TEMPLATE: added index.managed.js in Multipage Application.
  PROJECTEMP : remove unused code and Modify index.html. revmoe unused code and modify index.html.
  TEMPLATE: Added index.meta.xml for linking pages. Removed <br> tags and <a href> tags in index.html.
  PROJECTEMP : update license. add MIT license file and Modify notice. add boilerplate in js file.
  PROJETEMP : modify file name.
  DATABIND : update binding info. a. update uibinding.js b. change xmltojson.js library c. applied binding rules for widgets
  PROP : Remove type property on DateTimePicker
  PROJECTTEMP : Remove demo category Remove demo category from predefined animation
  PROJTEMP : Remove Custom CSS.
  PROJECTEMP: Remove unsed file and Modify index.html modify basic_page.xml
  DATABIND: modify the code gen for databinding
  PROJTEMP : add index.managed.js a. add app.init() b. add init_page() per page
  TEMPLATE : Add MIT License

Conflicts:
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/index.html
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/index.managed.js
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/index.html
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/index.managed.css
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/page1_720x1280_(9x16).css
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-fw/xmltojson.js
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/animator/Tizen-web-animator-fw.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.link.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/html.submit.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/tizen.datetimepicker.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/tizen.listdivider.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/templete/basic_page.xml
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt

Change-Id: I9e593b00785ad87861d4166dd15fee679ecb968a
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
1  2 
package/changelog
package/pkginfo.manifest
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/index.managed.js

@@@ -1,21 -1,3 +1,24 @@@
++* 0.1.331
++- [Title] remove template.
++== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-30
 +* 0.1.330
 +- [Title] Update version.
 +== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-29
 +* 0.1.329
 +- [Title] Update version.
 +== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-29
 +* 0.1.328
 +- [Title] remove unused file.
 +== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-29
 +* 0.1.327
 +- [Title] Update version.
 +== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-29
 +* 0.1.326
 +- [Title] Update version.
 +== Youngduk Hwang <youngduk.hwang@samsung.com> 2014-05-28
 +* 0.1.325
 +- [Title] Update version.
 +== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-27
  * 0.1.324
  - [Title] Update version.
  == Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-22
@@@ -1,5 -1,5 +1,5 @@@
 -Package : mobile-3.0-web-ui-builder-template
 -Version :0.1.324
 +Package : mobile-2.3-web-ui-builder-template
- Version :0.1.330
++Version :0.1.331
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os : ubuntu-32
  Maintainer : Changyeon Lee <changyeon.lee@samsung.com>, Gyeongmin Ju <gyeongmin.ju@samsung.com>, Nakyoung Choi <nakyoung2.choi@samsung.com>, Yonghwan Jeon <yonghwan82.jeon@samsung.com>