yonghwan82.jeon [Thu, 29 May 2014 12:24:32 +0000 (21:24 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
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
Change-Id: Id38c7ac0c89eb1f6b59be72ab8899d53b8b1b0a7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 09:39:03 +0000 (18:39 +0900)]
PROJECTEMP : update version.
Change-Id: I215f2dae5f4ec1e3ccb44be7f302fe6aad6a61a7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 09:38:09 +0000 (18:38 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
PROJECTEMP: Remove unsed file and Modify index.html modify basic_page.xml
PROJTEMP : add index.managed.js a. add app.init() b. add init_page() per page
Change-Id: I51f254afc238caf6800cfe957c6a463f62da4107
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 05:35:09 +0000 (14:35 +0900)]
PRJECTEMP : update version.
update version.
Change-Id: I2a92b3544e0a68f02c696edc504e803b54048b82
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 05:33:48 +0000 (14:33 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
TEMPLATE: modify n-screen css position
PROJECTEMP : Remove white space and Modify managed.css Remove white space in index.html and Modify filename in managed.css.
DATABIND : change the xmltojson.js a. update the xmltojson.js b. update the uibinding.js
UIB: support the file system (code gen)
TEMPLATE: apply data-uib attribute
PROJECTEMP : Fix for slideInDown, slideInLeft, SlideInRight predefined animation Add opacity for 100%
DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget
Conflicts:
templates/Template/Tizen Web UI Builder/5.Mobile2048/project/index.html
Change-Id: Ib53ee4663594a0b4f8a5ac590d68ee5b319f7c2d
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
gyeongmin.ju [Thu, 29 May 2014 05:23:08 +0000 (14:23 +0900)]
TEMPLATE: modify n-screen css position
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ide994d7d3edd1d4f90ce3fd8e4e60d78a1d9ef9e
yonghwan82.jeon [Thu, 29 May 2014 04:59:54 +0000 (13:59 +0900)]
PROJECTEMP : Remove white space and Modify managed.css
Remove white space in index.html and Modify filename in managed.css.
Change-Id: I2e5fbf8bca29cefea7a38e0e2a2ca7ca4cb686ea
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Wed, 28 May 2014 12:09:02 +0000 (21:09 +0900)]
DATABIND : change the xmltojson.js
a. update the xmltojson.js
b. update the uibinding.js
Change-Id: Id18c0da306e98f4081f5a4596049bddf781a7794
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
youngduk.hwang [Wed, 28 May 2014 07:38:29 +0000 (16:38 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB: support the file system (code gen)
TEMPLATE: apply data-uib attribute
PROJECTEMP : Fix for slideInDown, slideInLeft, SlideInRight predefined animation Add opacity for 100%
DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget
Change-Id: I1f822b28757d8e65c2f8da8423bb08670016475f
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
jaeyeol lee [Wed, 28 May 2014 06:20:49 +0000 (15:20 +0900)]
UIB: support the file system (code gen)
Change-Id: Ie14dbaf2d20b9b186e9ee30f31468d30c66868e8
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
gyeongmin.ju [Wed, 28 May 2014 05:26:38 +0000 (14:26 +0900)]
TEMPLATE: apply data-uib attribute
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I0003fcd18c11f19b968c8674de3a52d48ea87763
seongwon.shim [Tue, 27 May 2014 08:07:38 +0000 (17:07 +0900)]
PROJECTEMP : Fix for slideInDown, slideInLeft, SlideInRight predefined animation
Add opacity for 100%
Change-Id: I1b2c1b3390c4da6ab45366c0cacb5892baced627
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Tue, 27 May 2014 02:49:03 +0000 (19:49 -0700)]
Merge "DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget" into develop
yonghwan82.jeon [Tue, 27 May 2014 02:41:17 +0000 (11:41 +0900)]
PROJECTEMP : update version.
update version.
Change-Id: I0471dc3a24e9fdac7007a0aa492d899850acb847
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Tue, 27 May 2014 02:33:58 +0000 (19:33 -0700)]
Merge "DATABIND : update binding rules. a. update list divider b. update list item" into develop
Changyeon Lee [Tue, 27 May 2014 02:33:37 +0000 (19:33 -0700)]
Merge "PROJECTMP : rename css file. Remove pfile name of css file." into develop
Heekyoung, Oh [Tue, 27 May 2014 02:33:10 +0000 (11:33 +0900)]
DATABIND : update listdivider widget descriptor
a. add text binding for the listdivider widget
Change-Id: Ice074bf38873e15c4d66c37d489ae3e8fd65f8c9
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Tue, 27 May 2014 02:07:35 +0000 (11:07 +0900)]
DATABIND : update binding rules.
a. update list divider
b. update list item
Change-Id: Iea008ac025bf456aa32ccd7745101ca38ac17290
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Tue, 27 May 2014 01:28:29 +0000 (10:28 +0900)]
DATABIND : update StaticDatasource class
a. add self.options (that includes data field and dataType field)
b. fix the _create() function. (tobe) it can update the _self.options.
b. fix the _update() function. (tobe) it can assign the data.
Change-Id: I05256b0d747881ad17a56bf7c9d8e85fee3aa728
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
yonghwan82.jeon [Tue, 27 May 2014 01:23:22 +0000 (10:23 +0900)]
PROJECTMP : rename css file.
Remove pfile name of css file.
Change-Id: I499849e861c7912aa00feefd14672dfd0b7a97ad
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Mon, 26 May 2014 08:04:54 +0000 (17:04 +0900)]
PROJTEMP : Add z-index/visibility/overflow style. And css descriptor formatting.
Change-Id: I3de2c79508341ce28d6c39e61dcc4bf1325bc2b6
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Fri, 23 May 2014 06:46:36 +0000 (15:46 +0900)]
PROJTEMP : Add icons for StyleTab.
Change-Id: I101f116024b98edf9c150d7e356b640b69467895
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 10:28:09 +0000 (19:28 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen: (24 commits)
PROJECTEMP : Merge mw branch.
Merge remote-tracking branch 'origin/develop' into tizen
PROJECTEMP : add autors and license and notice.
PROJTEMP : Add default value of width/height.
PROJECTEMP : update version update version.
PROJECTEMP : Change setting of width in index.html. Change setting of width in index.html
PROJECTEMP : Modify template.
PROJECTEMP : change preview Image of Mobile 2048 Change preview Image.
NSCREEN : modify description of template. Modify description of template.
PROJECTEMP : update version
PROJECTEMP : Modify template. Mobile2048 add cssfile.
PROJECTEMP : Modify template Modify template
PROJECTEMP : modify sample. Modify mobile sample.
PROJECTEMP : add new template. add new template.
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/develop' into tizen
PROJECTEMP : Update version Update version info.
PROJECTEMP : Modify page_managed_css_ver0_0_3.xslt Remove space character for URL path.
PROJECTEMP : modify package namd and build script. Modify package name and build script.
...
Conflicts:
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
Change-Id: Ia167ea1bf19d4c4a9562dffd63e40dcfee25b8d5
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 10:19:05 +0000 (19:19 +0900)]
PROJECTEMP : Merge mw branch.
Change-Id: If027b937211d4070e8dab15371274d8da720e853
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 08:42:24 +0000 (17:42 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
PROJTEMP : Update index.managed.js.xslt for widget does not have id.
PROJECTEP : bugfix for manged_css. Modify page_managed_css file.
Merge remote-tracking branch 'origin/develop' into tizen
PROJTEMP : Update image descriptor.
PROJTEMP : Update image widget descriptor.
PROJTEMP : Add display style.
PROJTEMP : Modify javascript for widget position.
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP : Update "modifyStyle" function.
Merge remote-tracking branch 'origin/nscreen' into develop
Conflicts:
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
Change-Id: Ia256a25da5c45a51e39ebd8606956a12c574081f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 07:38:55 +0000 (16:38 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJECTEMP : Fix for swing animation description Add 0% property and merge each individual property which time was same
DATABIND : update the widget descriptors a. add attrhref type in the tizen.types.xml b. add attrhref binding for the link widget
DATABIND : update the descriptors a. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive, headingsix widgets b. add attr[src] binding for the image and thumbnail widget c. add slider binding for the slider widget
DATABIND : add value binding for the datetimepicker widget a. update the datetimepicker descriptor b. add value binding
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
PROJTEMP: fix width/height func on JS
DABABIND : update binding rules for widgets a. remove the foreach binding for the tokentextarea widget b. add the value binding for the date time picker widget c. add the text binding for the submit button widget d. add the text bindnig for the token text area
Change-Id: Iecef4e6fa137c3e989f19d6fbf3b425f0536777e
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Wed, 21 May 2014 06:00:14 +0000 (15:00 +0900)]
PROJECTEMP : Fix for swing animation description
Add 0% property and merge each individual property which time was same
Change-Id: Ib5ef2721d0b5506a4500c2b87126abc95646e00e
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Wed, 21 May 2014 01:22:31 +0000 (18:22 -0700)]
Merge "PROJECTEMP : add autors and license and notice." into mw
yonghwan82.jeon [Tue, 20 May 2014 11:42:02 +0000 (20:42 +0900)]
PROJECTEMP : add autors and license and notice.
Change-Id: Ia44b28c546d0f5bcc7f6eb19dd2832272d9fba38
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Tue, 20 May 2014 11:18:20 +0000 (20:18 +0900)]
DATABIND : update the widget descriptors
a. add attrhref type in the tizen.types.xml
b. add attrhref binding for the link widget
Change-Id: I640d503c8d0bd3044f48e1266499ace8a950a10d
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Tue, 20 May 2014 06:16:31 +0000 (23:16 -0700)]
Merge "PROJTEMP : Add default value of width/height." into mw
nakyoung2.choi [Tue, 20 May 2014 04:41:53 +0000 (13:41 +0900)]
PROJTEMP : Add default value of width/height.
Change-Id: If31d03ab200061b9423d0eaaf6f082731b557c59
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Sun, 18 May 2014 11:44:06 +0000 (20:44 +0900)]
PROJECTEMP : update version
update version.
Change-Id: I42ef608b20793504a30b85840b02540f110310cb
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Sun, 18 May 2014 11:41:23 +0000 (20:41 +0900)]
PROJECTEMP : Change setting of width in index.html.
Change setting of width in index.html
Change-Id: I56a9bb5fc1fae6b400f45f6b66407618c063dcf4
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 16:21:09 +0000 (01:21 +0900)]
PROJECTEMP : Modify template.
Change-Id: Ib917b162bad5eb3e3915a1bc513e79ee1510877d
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 11:35:50 +0000 (20:35 +0900)]
PROJECTEMP : change preview Image of Mobile 2048
Change preview Image.
Change-Id: I17d7a04c546850420de8c9826da42b0eae00c2f0
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 10:35:27 +0000 (19:35 +0900)]
NSCREEN : modify description of template.
Modify description of template.
Change-Id: I6de9077823c69bd49488305cf2cf121c7b0b0f64
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:55:48 +0000 (15:55 +0900)]
PROJECTEMP : update version
Change-Id: Ib2036d1547b1ceafdc0abce53bcd319714c40f10
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:38:04 +0000 (15:38 +0900)]
PROJECTEMP : Modify template.
Mobile2048 add cssfile.
Change-Id: I3f862f6382deb0bca5a9c495b32b588e68114435
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:18:55 +0000 (15:18 +0900)]
PROJECTEMP : Modify template
Modify template
Change-Id: I0dcd2a602607e4ef8deacdaaac9c4d16c410e7e4
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 06:12:08 +0000 (15:12 +0900)]
DATABIND : update the descriptors
a. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive, headingsix widgets
b. add attr[src] binding for the image and thumbnail widget
c. add slider binding for the slider widget
Change-Id: Iac777e901876a0986d78dcaa6f56bc421cbe124e
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:57:40 +0000 (11:57 +0900)]
DATABIND : add value binding for the datetimepicker widget
a. update the datetimepicker descriptor
b. add value binding
Change-Id: I1128b9cd2b309d66b040cbb7a6b4c4f004bf6602
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:10:08 +0000 (11:10 +0900)]
DATABIND : add text binding for the submit button widget
a. update the submit button descriptor
b. add text binding
Change-Id: Ied469fcda13f8b6ca0ba51e64de79253ef5f6c11
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Thu, 15 May 2014 10:41:35 +0000 (03:41 -0700)]
Merge "PROJTEMP: fix width/height func on JS" into develop
gyeongmin.ju [Thu, 15 May 2014 10:39:18 +0000 (19:39 +0900)]
PROJTEMP: fix width/height func on JS
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I76f70c3cc923f853e0046afe7ca94af99f7785d3
yonghwan82.jeon [Thu, 15 May 2014 10:30:43 +0000 (19:30 +0900)]
PROJECTEMP : modify sample.
Modify mobile sample.
Change-Id: Ib4861fbc82a45d5b183e53ed441a8b6bfe47cd4b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Thu, 15 May 2014 10:28:14 +0000 (19:28 +0900)]
DABABIND : update binding rules for widgets
a. remove the foreach binding for the tokentextarea widget
b. add the value binding for the date time picker widget
c. add the text binding for the submit button widget
d. add the text bindnig for the token text area
Change-Id: I13e5a5d7252b57e586bd63fd2ebcc25801f791a6
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 07:25:06 +0000 (16:25 +0900)]
PROJECTEMP : add new template.
add new template.
Change-Id: If6b9f9547f13318716a95b2b593383dfe57901ad
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 06:15:22 +0000 (15:15 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
PROJTEMP : Update index.managed.js.xslt for widget does not have id.
PROJECTEP : bugfix for manged_css. Modify page_managed_css file.
Merge remote-tracking branch 'origin/develop' into tizen
PROJTEMP : Update image descriptor.
PROJTEMP : Update image widget descriptor.
PROJTEMP : Add display style.
PROJTEMP : Modify javascript for widget position.
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP : Update "modifyStyle" function.
Merge remote-tracking branch 'origin/nscreen' into develop
Change-Id: I384d58a15fd2fd8f22d1f9eb27279889f6cd3001
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 06:06:48 +0000 (15:06 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP : Update index.managed.js.xslt for widget does not have id.
PROJECTEP : bugfix for manged_css. Modify page_managed_css file.
PROJTEMP : Update image descriptor.
PROJTEMP : Update image widget descriptor.
PROJTEMP : Add display style.
PROJTEMP : Modify javascript for widget position.
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP : Update "modifyStyle" function.
Merge remote-tracking branch 'origin/nscreen' into develop
Conflicts:
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
Change-Id: If2236261c8b68ed8b1f7b88b07519308e0980fa9
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Thu, 15 May 2014 04:42:23 +0000 (13:42 +0900)]
PROJTEMP : Update index.managed.js.xslt for widget does not have id.
Change-Id: I1c0865739b9d0ff01e29b143098f7fe694dfd19e
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 04:21:07 +0000 (13:21 +0900)]
PROJECTEP : bugfix for manged_css.
Modify page_managed_css file.
Change-Id: Ieec51c54d399991e54ba27de350989fc2ffff5fa
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 11:52:21 +0000 (20:52 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
Change-Id: Ib54a1285967d8743389308d5d74740643871aea6
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Wed, 14 May 2014 11:49:51 +0000 (20:49 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP : Update image descriptor.
PROJTEMP : Update image widget descriptor.
PROJTEMP : Add display style.
PROJTEMP : Modify javascript for widget position.
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP : Update "modifyStyle" function.
Merge remote-tracking branch 'origin/nscreen' into develop
Change-Id: I3a83838b4a8c63a7df0c44e817fba6d2e779d7ed
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Wed, 14 May 2014 11:21:29 +0000 (20:21 +0900)]
PROJTEMP : Update image descriptor.
Change-Id: If75da4c1dce5f5f1bd208e47dfcb161a80116c91
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Wed, 14 May 2014 10:08:24 +0000 (19:08 +0900)]
PROJTEMP : Update image widget descriptor.
Change-Id: I5c6796df1ea5970ee01d274a2d0b23f3504f469b
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Tue, 13 May 2014 10:56:04 +0000 (19:56 +0900)]
PROJTEMP : Add display style.
Change-Id: I33552115a890b18b36d0b62c1c50ee16021b2e03
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Tue, 13 May 2014 05:47:50 +0000 (14:47 +0900)]
PROJECTEMP : Update version
Update version info.
Change-Id: Ie90f59a04a2cf2e469b4df260e1fd561d385fe3f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Tue, 13 May 2014 05:42:04 +0000 (14:42 +0900)]
PROJECTEMP : Modify page_managed_css_ver0_0_3.xslt
Remove space character for URL path.
Change-Id: I198cc6ed0af804932c135d10e4807b6feb0e2829
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Tue, 13 May 2014 05:12:02 +0000 (14:12 +0900)]
PROJECTEMP : modify package namd and build script.
Modify package name and build script.
Change-Id: I0b18f0cb842780538dee9f43d3190d8f7b7908a0
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Tue, 13 May 2014 02:59:27 +0000 (11:59 +0900)]
PROJTEMP : Modify javascript for widget position.
Change-Id: I96ca14abde2c85c24b973f7343bf04350b512cf1
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 13:28:06 +0000 (22:28 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
PROJECTEMP : update version update version.
Merge remote-tracking branch 'origin/develop' into tizen
PROJTEMP: Update version
Change-Id: I123420a43cbf71bd2fba706f8d5e5c4ad8ba24fd
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 13:26:45 +0000 (22:26 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
PROJECTEMP : update version update version.
Merge remote-tracking branch 'origin/develop' into tizen
Conflicts:
package/changelog
Change-Id: Id4aed1f497df31f676e809ccc08a2f7539236957
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 13:20:27 +0000 (22:20 +0900)]
PROJECTEMP : update version
update version.
Change-Id: I4e444776c20e5ca7d44bd55a5048ab9825e8ef17
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 13:18:12 +0000 (22:18 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP : Update "modifyStyle" function.
Merge remote-tracking branch 'origin/nscreen' into develop
Change-Id: I2cdcbb6cf0d84e165affac5552f46f0b20fdc13c
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Mon, 12 May 2014 13:12:15 +0000 (22:12 +0900)]
PROJTEMP : Update "modifyStyle" function.
Change-Id: Ib9c2cb6ba12be63cb48ebb3d9c20f535babdf4ee
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 13:07:58 +0000 (22:07 +0900)]
Merge remote-tracking branch 'origin/nscreen' into develop
* origin/nscreen:
Merge remote-tracking branch 'origin/develop' into nscreen
NSCREEN : Modify XSLT by new NScreenModel.
NSCREEN : modify page_managed_css_ver0_0_3.xslt file
Change-Id: I809881f33ea719963cfccd089078e213125e4d15
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 12 May 2014 11:43:20 +0000 (20:43 +0900)]
PROJECTEMP : merge tizen branch.
Merge tizen branch.
Change-Id: I01161fec6a0efc0807ad0084fc232c9334a126ba
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jaeyeol lee [Mon, 12 May 2014 10:32:04 +0000 (19:32 +0900)]
PROJTEMP: Update version
Change-Id: I51dbecdd63b59c548addc4897dc9aa6b91ab5ae7
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Fri, 9 May 2014 09:38:30 +0000 (18:38 +0900)]
DATABIND : support multi binding in the widget
Change-Id: I50a858903a2da1383892d65020d79d5c34b0690a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Wed, 7 May 2014 09:22:45 +0000 (02:22 -0700)]
Merge "PROP : Set default values for color and size." into develop
Changyeon Lee [Wed, 7 May 2014 09:22:33 +0000 (02:22 -0700)]
Merge "PROJTEMP : ground.js update java script method for CSSSelector added." into develop
nakyoung2.choi [Wed, 30 Apr 2014 05:59:54 +0000 (14:59 +0900)]
PROP : Set default values for color and size.
Change-Id: I2d2518ce689e37f4c1d3c1f18e218c6261b9caa2
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jooyoul_lee [Wed, 30 Apr 2014 05:44:21 +0000 (14:44 +0900)]
PROJTEMP : ground.js update
java script method for CSSSelector added.
Change-Id: Ic792d27b42c0433913d42dfb22a5f642431ce837
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
jaeyeol lee [Wed, 30 Apr 2014 04:45:08 +0000 (13:45 +0900)]
PROP : Add the OpenURL
Change-Id: I1812c772c4f20137233807e89c3744b249679ea4
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Mon, 28 Apr 2014 08:10:07 +0000 (01:10 -0700)]
Merge "DATABIND : Add dataSourceFile class a. can access the file included app b. can read xml or json data type of file" into develop
Heekyoung, Oh [Mon, 28 Apr 2014 07:17:43 +0000 (16:17 +0900)]
DATABIND : Add dataSourceFile class
a. can access the file included app
b. can read xml or json data type of file
Change-Id: I4ebb18d16cce19601d830c98ebe2fd0303d92d64
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
jaeyeol lee [Sat, 26 Apr 2014 06:39:30 +0000 (15:39 +0900)]
DATABIND : Modify the code generation for system APIs
Change-Id: Iff9edf34e31c40b2ce6a57db6c35b739967ea96e
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
yonghwan82.jeon [Thu, 24 Apr 2014 11:10:35 +0000 (20:10 +0900)]
PROJTEMP : Update version
update version
Change-Id: I3ff9f6d4dcbab2e4585492c01618c309eacfdc8d
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Thu, 24 Apr 2014 07:34:37 +0000 (16:34 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP: xmltojson.js was declared on index.html a. xmltojson.js was declared on the head of the index.html
PROJTEMP : fix the Remote Class in uibinding.js a. add xmltojson.js for xml parsing b. can support data type for xml c. can change request header
DATABIND : Modify the code generation for the databinding
PROP : Add folding attribute on category element. Add folding attribute on category element. And adds border-top/border-bottom/border-left/border-right style
PROJECTEMP : Modify page_managed_css_ver0_0_3.xslt. Change "device-width" from "width". Tizen supported "device-with".
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP : Modify predefined animation descriptor Change rotate to rotateZ in rollIn, rollOut Seperate proerty in flip
DATABIND : Fixed a bug in the code generation.
PROJTEMP : Modify predefined animation descriptor Add keyframe for bounce. Change property name for rollIn, rollOut(rotate -> rotateZ)
PROJTEMP: add dataSourceCallhistory class (uibinding.js) a. parameters are changed to the upper case b. add new class that dataSourceCallhistory
PROJTEMP: fix the Calendar Class a. add device apis ( unified, default, selected calendarId)
PROJTEMP: add dataSourceCalendar class in the uibinding.js a. rename the parameter, from type to method b. define the new class for dataSourceCalendar that using tizen calendar apis
UIB : Update ground.js for live dom.
Conflicts:
package/changelog
package/pkginfo.manifest
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-fw/uibinding.js
Change-Id: I6f507e734370a3401e42b71c982399d333147bf4
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Tue, 22 Apr 2014 11:41:59 +0000 (20:41 +0900)]
PROJTEMP: xmltojson.js was declared on index.html
a. xmltojson.js was declared on the head of the index.html
Change-Id: I307b6089095dc81fa3068eb2aa4ae21c36eff397
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Tue, 22 Apr 2014 11:32:00 +0000 (20:32 +0900)]
PROJTEMP : fix the Remote Class in uibinding.js
a. add xmltojson.js for xml parsing
b. can support data type for xml
c. can change request header
Change-Id: I604e4dc847a704ea68b6190d6d55bde1a045a053
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Mon, 21 Apr 2014 13:20:06 +0000 (06:20 -0700)]
Merge "DATABIND : Modify the code generation for the databinding" into develop
Changyeon Lee [Thu, 17 Apr 2014 15:50:43 +0000 (08:50 -0700)]
Merge "PROP : Add folding attribute on category element. Add folding attribute on category element. And adds border-top/border-bottom/border-left/border-right style" into develop
jaeyeol lee [Thu, 17 Apr 2014 08:26:26 +0000 (17:26 +0900)]
DATABIND : Modify the code generation for the databinding
Change-Id: If7872cbd77fa0e34ccb609c900626678c4154f04
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Thu, 17 Apr 2014 04:11:13 +0000 (13:11 +0900)]
PROP : Add folding attribute on category element.
Add folding attribute on category element. And adds border-top/border-bottom/border-left/border-right style
Change-Id: I94314cfb9a399cabf5e37fc050fc84dd8f45771c
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Mon, 14 Apr 2014 04:45:44 +0000 (13:45 +0900)]
PROJECTEMP : Modify page_managed_css_ver0_0_3.xslt.
Change "device-width" from "width".
Tizen supported "device-with".
Change-Id: Ie996b4af566aa3508f3112f2b819d401228c31a9
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:59:44 +0000 (17:59 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
PROJTEMP : Update version.
Merge remote-tracking branch 'origin/develop' into tizen
PROP : Adds a position value.
PROP : Changes CSS descriptor for brief message.
PROJTEMP: Add & Modify widget icons. Modify descriptor XML.
PROJTEMP: Rename descriptor files.
TEMPLATE : Update version
Change-Id: I1cdcfd0fe84ff25c70f21ffb3d9e2ab2bf51ccf1
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:38:39 +0000 (17:38 +0900)]
PROJTEMP : Update version.
Change-Id: I0e7b029e92b1526797ea9b999922eec3d2f5f6ac
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:35:46 +0000 (17:35 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP : Modify predefined animation descriptor Change rotate to rotateZ in rollIn, rollOut Seperate proerty in flip
DATABIND : Fixed a bug in the code generation.
PROJTEMP : Modify predefined animation descriptor Add keyframe for bounce. Change property name for rollIn, rollOut(rotate -> rotateZ)
PROJTEMP: add dataSourceCallhistory class (uibinding.js) a. parameters are changed to the upper case b. add new class that dataSourceCallhistory
PROJTEMP: fix the Calendar Class a. add device apis ( unified, default, selected calendarId)
PROJTEMP: add dataSourceCalendar class in the uibinding.js a. rename the parameter, from type to method b. define the new class for dataSourceCalendar that using tizen calendar apis
UIB : Update ground.js for live dom.
Change-Id: I837f1bbc5bbea99d39fac6997c8bdda857854b94
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
seongwon.shim [Wed, 9 Apr 2014 04:52:28 +0000 (13:52 +0900)]
PROJTEMP : Modify predefined animation descriptor
Change rotate to rotateZ in rollIn, rollOut
Seperate proerty in flip
Change-Id: Ide89c0e16472bfb1d10ddee7e453c19e9e9302e3
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Mon, 7 Apr 2014 10:17:33 +0000 (03:17 -0700)]
Merge "PROJTEMP : Modify predefined animation descriptor Add keyframe for bounce. Change property name for rollIn, rollOut(rotate -> rotateZ)" into develop
jaeyeol lee [Fri, 4 Apr 2014 08:38:10 +0000 (17:38 +0900)]
DATABIND : Fixed a bug in the code generation.
Change-Id: If874f78881c5609bf2dc6ac3c8dc5c345df6b142
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
seongwon.shim [Fri, 4 Apr 2014 08:42:13 +0000 (17:42 +0900)]
PROJTEMP : Modify predefined animation descriptor
Add keyframe for bounce.
Change property name for rollIn, rollOut(rotate -> rotateZ)
Change-Id: Ic5cbaa75f2ef15904e136af4f3585faf6300bb3b
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Heekyoung, Oh [Fri, 4 Apr 2014 08:04:23 +0000 (17:04 +0900)]
PROJTEMP: add dataSourceCallhistory class (uibinding.js)
a. parameters are changed to the upper case
b. add new class that dataSourceCallhistory
Change-Id: I23e9eec9d062f42ca40d50ef555ef714bd482dad
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Tue, 1 Apr 2014 11:37:26 +0000 (20:37 +0900)]
PROJTEMP: fix the Calendar Class
a. add device apis ( unified, default, selected calendarId)
Change-Id: Ib772f2bf257ac48cc22845efd9cbfb0a3b8b0b98
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Mon, 17 Mar 2014 10:37:14 +0000 (19:37 +0900)]
PROJTEMP: add dataSourceCalendar class in the uibinding.js
a. rename the parameter, from type to method
b. define the new class for dataSourceCalendar that using tizen calendar apis
Change-Id: I106d701d5fa3a5b19e666ece434130da2decabf1
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
mucikan [Fri, 14 Mar 2014 08:33:27 +0000 (17:33 +0900)]
UIB : Update ground.js for live dom.
Update ground.js for live dom.
Change-Id: Ifb5cded4f99eeaa84266e344e415d8af04bd5214
Signed-off-by: mucikan <nakyoung2.choi@samsung.com>
seongwon.shim [Thu, 13 Mar 2014 08:07:46 +0000 (17:07 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
PROJTEMP version up version up
PROJTEMP: add dataSourceContact class in the uibinding.js a. rename the dataSourceRuntime to the dataSourceContact. b. modified 'options' , it includes addressBookType and addressBookId c. refactoring functions and procedures
Merge remote-tracking branch 'origin/tizen' into develop
PROJTEMP: Modified the page-system.js Modified app class. because 'app' was used before it was defined in the page-system.js
PROJTEMP: change the head of index.html applied proper script. for the new javascript files are included. uibinding.js seperated. first knockout.js is called. after knockout.mapping.js knockout.bindingselector.js, uibinding.js are called. they are hard-coded dependency on knockout.
PROJTEMP: Change fw code from min to normal. Animator framework source code is changed from minimized to nomal. And Fixed jsdt errors about all templates.
PROJTEMP: Modify predefined animation Property. Change left, top to translateX, translateY in tizen.animator.motionPath.move.xml
PROJTEMP: Change fw code from min to normal. Animator framework source code is changed from minimized to nomal. And Fixed jsdt errors.
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: I85866c39999856dcca3e4b9c5e9fc1065d43dc17
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
seongwon.shim [Thu, 13 Mar 2014 07:12:26 +0000 (16:12 +0900)]
PROJTEMP version up
version up
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Change-Id: I8349cfefd7ea48ad07385389ba4c4374ab2b4ae3
projects / profile / mobile / sdk / web-ui-builder-template.git / log