jeonghwan kim [Fri, 25 Apr 2014 07:38:07 +0000 (16:38 +0900)]
ResourcesView : support JPEG format
Change-Id: I406fab5338469fbbd191f2dbb8f9ab08363519eb
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
gyeongmin.ju [Tue, 22 Apr 2014 13:50:57 +0000 (22:50 +0900)]
UIB : add rhino JavaScript engine library
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: If6783d2cd10a2edc7226c4dcec2366d7c8a85ded
Changyeon Lee [Tue, 22 Apr 2014 13:45:33 +0000 (06:45 -0700)]
Merge "UIB : add Model Reader/Writer" into develop
Changyeon Lee [Tue, 22 Apr 2014 13:45:20 +0000 (06:45 -0700)]
Merge "PROP : Add live style edit." into develop
Changyeon Lee [Tue, 22 Apr 2014 13:45:04 +0000 (06:45 -0700)]
Merge "ANIMATOR : Bug fix for findAnimator Pass AnimatorWidgetPart when inkove findAnimator Change parent selector in replaceAll from AnimatorSelector" into develop
gyeongmin.ju [Tue, 22 Apr 2014 13:42:45 +0000 (22:42 +0900)]
UIB : add Model Reader/Writer
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I03b99a44d925c2f5680a55dd8c1cc5afbcff3756
seongwon.shim [Tue, 22 Apr 2014 06:31:23 +0000 (15:31 +0900)]
ANIMATOR : Bug fix for findAnimator
Pass AnimatorWidgetPart when inkove findAnimator
Change parent selector in replaceAll from AnimatorSelector
Change-Id: Icc27be10952899b748030ba251706696cfb149b2
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jinwooim.bae [Tue, 22 Apr 2014 06:47:59 +0000 (15:47 +0900)]
ANIMATOR : Control time in TimeText
This is new composite for control time selection.
Change-Id: I98c60fac55dcbd01ead97c08dd8f49d87bf8fa4a
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
nakyoung2.choi [Tue, 22 Apr 2014 07:33:52 +0000 (16:33 +0900)]
PROP : Add live style edit.
Change-Id: I72a8c90bbb93f414023198a86a7e27d244778c65
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Mon, 21 Apr 2014 13:22:06 +0000 (06:22 -0700)]
Merge "UIB : code refactoring" into develop
Changyeon Lee [Mon, 21 Apr 2014 13:21:56 +0000 (06:21 -0700)]
Merge "UIB : add model serializer" into develop
Changyeon Lee [Mon, 21 Apr 2014 13:21:47 +0000 (06:21 -0700)]
Merge "PROP : Fixed dispose bug in CategoryComposite." into develop
Changyeon Lee [Mon, 21 Apr 2014 13:21:12 +0000 (06:21 -0700)]
Merge "ANIMATOR : Bug fix for AnimatorSelector remove/add & Refactoring Compare with Selector when remove AnimatorSelector from AnimatorWidget Move method frmo AnimatorModelManager to AnimatorPart related class" into develop
Changyeon Lee [Mon, 21 Apr 2014 13:20:51 +0000 (06:20 -0700)]
Merge "ANIMATOR : Add refresh selectorAnimator This code is selectorAnimator event for refresh." into develop
Changyeon Lee [Mon, 21 Apr 2014 13:20:40 +0000 (06:20 -0700)]
Merge "ANIMATOR : Fixed playheader This is be fixed playheader when paly animation." into develop
Changyeon Lee [Mon, 21 Apr 2014 13:20:27 +0000 (06:20 -0700)]
Merge "DATABIND : Added the feature to change the model name and the data source name" into develop
gyeongmin.ju [Mon, 21 Apr 2014 13:07:23 +0000 (22:07 +0900)]
UIB : code refactoring
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I94ea7d4c254b4580f5ff512bf1b297e8b28f1aa8
gyeongmin.ju [Mon, 21 Apr 2014 12:56:47 +0000 (21:56 +0900)]
UIB : add model serializer
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Iebf864cbcc2aec22b983c3d4357432bb872de0b4
seongwon.shim [Mon, 21 Apr 2014 08:13:36 +0000 (17:13 +0900)]
ANIMATOR : Bug fix for AnimatorSelector remove/add & Refactoring
Compare with Selector when remove AnimatorSelector from AnimatorWidget
Move method frmo AnimatorModelManager to AnimatorPart related class
Change-Id: I3b7e323372b7179d95a2aa9700522508e19ff8a1
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
nakyoung2.choi [Mon, 21 Apr 2014 07:32:17 +0000 (16:32 +0900)]
PROP : Fixed dispose bug in CategoryComposite.
Change-Id: Ifba43171ef6781fa8ae159e4af8dff0c88f2f4eb
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jinwooim.bae [Mon, 21 Apr 2014 04:16:19 +0000 (13:16 +0900)]
ANIMATOR : Add refresh selectorAnimator
This code is selectorAnimator event for refresh.
Change-Id: Ia11f5afa9f46fb2bcc12fd853875a263519aaccc
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
jinwooim.bae [Fri, 18 Apr 2014 09:21:27 +0000 (18:21 +0900)]
ANIMATOR : Fixed playheader
This is be fixed playheader when paly animation.
Change-Id: I9943037fcab6193bd044567f845cb2b65a8446f6
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Thu, 17 Apr 2014 15:51:37 +0000 (08:51 -0700)]
Merge "ANIMATOR : To Fill button image This is the tranceparent background to fill the button on linux." into develop
Changyeon Lee [Thu, 17 Apr 2014 15:51:12 +0000 (08:51 -0700)]
Merge "NSCREEN : Recovery NScreen action. Recovery NScreen action." into develop
Changyeon Lee [Thu, 17 Apr 2014 15:50:58 +0000 (08:50 -0700)]
Merge "PROP : Add folding feature on CategoryComposite." into develop
jaeyeol lee [Thu, 17 Apr 2014 07:36:01 +0000 (16:36 +0900)]
DATABIND : Added the feature to change the model name and the data source
name
Change-Id: I7925b871654bad9b21caf6f820d33769a5baa65a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
yonghwan82.jeon [Thu, 17 Apr 2014 07:05:56 +0000 (16:05 +0900)]
NSCREEN : Recovery NScreen action.
Recovery NScreen action.
Change-Id: Ia76646411b39e0d0f2160fa93db0e8ab6167a92f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jinwooim.bae [Thu, 17 Apr 2014 06:18:48 +0000 (15:18 +0900)]
ANIMATOR : To Fill button image
This is the tranceparent background to fill the button on linux.
Change-Id: Ideceee6c627e64d96aea5d9ab01d228e20eeeec6
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Thu, 17 Apr 2014 03:59:09 +0000 (20:59 -0700)]
Merge "UIB : Prevent checking AppManger. Current, Appmanger always is null. Filter code is frequently used. Filter code is always printed error log. Prevent checking Appmanger." into develop
Changyeon Lee [Thu, 17 Apr 2014 03:58:54 +0000 (20:58 -0700)]
Merge "ResourcesView : Refactoring selection and action Adding KeyHandler" into develop
Changyeon Lee [Thu, 17 Apr 2014 03:58:43 +0000 (20:58 -0700)]
Merge "ANIMATOR : Clean up model related code Remove unused files and method" into develop
Changyeon Lee [Thu, 17 Apr 2014 03:58:35 +0000 (20:58 -0700)]
Merge "ANIMATOR : Change predeinfed frame to custom frame Change predefined flag to false when prdefined frame has changed by user" into develop
nakyoung2.choi [Thu, 17 Apr 2014 03:51:23 +0000 (12:51 +0900)]
PROP : Add folding feature on CategoryComposite.
Change-Id: I4c408f12ab1af4f624b5ab85e64f3976f4aa4559
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jinwooim.bae [Wed, 16 Apr 2014 11:20:32 +0000 (20:20 +0900)]
ANIMATOR : Modified PlayHeader
PlayHeader was Shell. Now it is Composite.
Change-Id: I3f830a8b9e1fee20fbb5288c9e364009ad30269c
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Wed, 16 Apr 2014 09:35:47 +0000 (18:35 +0900)]
ANIMATOR : Clean up model related code
Remove unused files and method
Change-Id: Ic3a447d5f79449a5a8e05cf1241f32796a77b3d2
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
seongwon.shim [Wed, 16 Apr 2014 04:38:53 +0000 (13:38 +0900)]
ANIMATOR : Change predeinfed frame to custom frame
Change predefined flag to false when prdefined frame has changed by user
Change-Id: I9aa20a45e30082c62acddf5a67142897affef4f6
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Wed, 16 Apr 2014 04:31:39 +0000 (13:31 +0900)]
UIB : Prevent checking AppManger.
Current, Appmanger always is null.
Filter code is frequently used.
Filter code is always printed error log.
Prevent checking Appmanger.
Change-Id: Ie56cf6982042403d66ca516e75b49f12389d4794
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jeonghwan kim [Wed, 16 Apr 2014 04:19:33 +0000 (13:19 +0900)]
ResourcesView : Refactoring selection and action
Adding KeyHandler
Change-Id: Ic6e24f20248cc541f882e02af60e4de22195e7d8
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
Changyeon Lee [Wed, 16 Apr 2014 03:40:57 +0000 (20:40 -0700)]
Merge "ANIMATOR : Change by drawing on the Canvas This is changed TimelineElement. It did to be swt. But it changed the canvas to draw." into develop
Changyeon Lee [Wed, 16 Apr 2014 03:40:47 +0000 (20:40 -0700)]
Merge "ANIMATOR : Add AnimatorModel event Add SELECTOR_REFERSH for refresh each AnimatorSelector" into develop
Changyeon Lee [Wed, 16 Apr 2014 03:40:38 +0000 (20:40 -0700)]
Merge "ANIMATOR : Implements merge and split keyframe when keyframe edited Merge keyframe if border frames doesnot have same computed properties and split keyframe if border frames do have same computed properties" into develop
jinwooim.bae [Tue, 15 Apr 2014 01:09:06 +0000 (10:09 +0900)]
ANIMATOR : Change by drawing on the Canvas
This is changed TimelineElement. It did to be swt. But it changed the canvas to draw.
Change-Id: I665a11dd9cf9d48aafe06e4f92fc736293df5f94
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Tue, 15 Apr 2014 01:20:16 +0000 (10:20 +0900)]
ANIMATOR : Add AnimatorModel event
Add SELECTOR_REFERSH for refresh each AnimatorSelector
Change-Id: I1c74080b63714cb1d228baca9a349f88ec4cc578
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
seongwon.shim [Mon, 14 Apr 2014 07:02:14 +0000 (16:02 +0900)]
ANIMATOR : Implements merge and split keyframe when keyframe edited
Merge keyframe if border frames doesnot have same computed properties and split keyframe if border frames do have same computed properties
Change-Id: I34be0b1547787bab7f6b4c5aa383807739d99915
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jaeyeol lee [Mon, 14 Apr 2014 06:58:08 +0000 (15:58 +0900)]
DATABIND : Add the shortcut in the databinding view
Data Source & View model can be deleted using the del key
Change-Id: I6954cca5516d4967de7ad2bab091ec395b61d1d7
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Mon, 14 Apr 2014 05:14:19 +0000 (14:14 +0900)]
DATABIND : Fixed a bug that can not refresh in the binding info panel.
Add a listener to the page
Change-Id: Icc511f3153a937d6465838afba15a15090a48792
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Mon, 14 Apr 2014 04:37:27 +0000 (21:37 -0700)]
Merge "DATABIND : change the check logic when add privilege." into develop
Changyeon Lee [Mon, 14 Apr 2014 04:35:31 +0000 (21:35 -0700)]
Merge "PROP : Removes NPE." into develop
Changyeon Lee [Mon, 14 Apr 2014 04:35:16 +0000 (21:35 -0700)]
Merge "DATABIND : implemented the context menu in the databinding view" into develop
parary [Fri, 11 Apr 2014 05:09:12 +0000 (14:09 +0900)]
DATABIND : change the check logic when add privilege.
Change-Id: I1e453cab18a25087f66f02cfd5ad4e4b23ef0073
Signed-off-by: parary <kyunghan80.park@samsung.com>
jooyoul_lee [Fri, 11 Apr 2014 04:50:29 +0000 (13:50 +0900)]
DESIGNER : CSS Selector bug fix, UX enhanced
Designer UX enhanced, bug fixed.
Change-Id: Ifa2adff1acc8031e41bd4b8286be72cd9dc46185
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
nakyoung2.choi [Fri, 11 Apr 2014 02:19:53 +0000 (11:19 +0900)]
PROP : Removes NPE.
Change-Id: I932a2e1ab10a048fbcdbb5411d9e02d81ea27793
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Fri, 11 Apr 2014 00:18:16 +0000 (09:18 +0900)]
DATABIND : implemented the context menu in the databinding view
Change-Id: Ia133bf1c6f2aa28522b61eb5417ea140f3bfab19
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 09:07:51 +0000 (18:07 +0900)]
UIB : Merge tizen branch.
Change-Id: Ia0620f261ab230defa594747ed5a62892f5afa27
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:26:11 +0000 (17:26 +0900)]
UIB : version update.
Change-Id: I70e560c4c5ece9222fcf812688a5ca8a7640074d
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:13:00 +0000 (17:13 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
UIB : Refactoring actions
DATABIND : Change the CompilationUnitEditor init method parameter.
PROP: fixed NPE
ANIMATOR : Implements Predefined Animation createion logic AnimatorFrame only has relative value for own's property and then computed property inserted when I/O occured for Predefined Animation
DATABIND : bufix - selection error - select widget after execute 'set data source' dialog.
DATABIND : Make the toolbar in the binding info panel
DATABIND : Add Privilege in config.xml when data sources[calendar, contact,call history] was defined.
UIB : code refactoring
SNIPPET : Refactoring snippet and template
DATABIND : modify the code generation for the meta file The data source can be saved in the metafile
DATABIND : Change and Add Source Type in Set Data Source Dialog. Change - Runtime API -> Contact. Add - Call History. Add - Calendar. Add - File System.
DATABIND: add sample file (callhistory.json) a. add sample file
DATABIND : Modified incorrect information in the binding info panel
PROP : Add reset styles.
DATABIND : Bug fix[ContactSubPage.loadData].
DATABIND : Changes UI Set Data Source Contact Dialog.
ANIMATOR : Keyframe add/edit command refactoring Implements logic that keyframe name modification for undo/redo. Integrate keyframe manipulation command from properties view.
DATABIND : Bug fixed in the databinding view Bug fixed that can not load
UIB : Removing warning message in feature.xml
UIB : remove NPE
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
Change-Id: I6138d0b12fffdc9408ad55c69648109722d0d1e4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jeonghwan kim [Thu, 10 Apr 2014 03:29:43 +0000 (12:29 +0900)]
UIB : Refactoring actions
Change-Id: I038966f755bc87a19e7e7b67357caca7a6345937
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
parary [Thu, 10 Apr 2014 02:02:05 +0000 (11:02 +0900)]
DATABIND : Change the CompilationUnitEditor init method parameter.
Change-Id: I0290cd7485529222f735ed6b854929cbd94f5037
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Wed, 9 Apr 2014 09:24:36 +0000 (02:24 -0700)]
Merge "PROP: fixed NPE" into develop
gyeongmin.ju [Wed, 9 Apr 2014 09:05:51 +0000 (18:05 +0900)]
PROP: fixed NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I48677b4bb93cb02b99db93e78a668565f314c740
seongwon.shim [Wed, 9 Apr 2014 05:31:06 +0000 (14:31 +0900)]
ANIMATOR : Implements Predefined Animation createion logic
AnimatorFrame only has relative value for own's property and then computed property inserted when I/O occured for Predefined Animation
Change-Id: Ibde29c1ae9169bd5652f20616b4c0df0118bb95a
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
parary [Wed, 9 Apr 2014 04:25:21 +0000 (13:25 +0900)]
DATABIND : bufix
- selection error - select widget after execute 'set data source'
dialog.
Change-Id: Ie94f311002702cb42e343dc24bdfb53ca7c5da22
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Wed, 9 Apr 2014 01:53:29 +0000 (18:53 -0700)]
Merge "DATABIND : Make the toolbar in the binding info panel" into develop
jaeyeol lee [Tue, 8 Apr 2014 07:53:38 +0000 (16:53 +0900)]
DATABIND : Make the toolbar in the binding info panel
Change-Id: Ieca48f0e1794f6af6673000483710dde3ae881db
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
parary [Tue, 8 Apr 2014 01:38:29 +0000 (10:38 +0900)]
DATABIND : Add Privilege in config.xml when data sources[calendar, contact,call history] was defined.
Change-Id: I068295aff659e6960629b822d9c1010ff3a810f9
Signed-off-by: parary <kyunghan80.park@samsung.com>
gyeongmin.ju [Mon, 7 Apr 2014 10:47:20 +0000 (19:47 +0900)]
UIB : code refactoring
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I220ff3fa647135b4f2ff1af8d861d4eb650d9805
Changyeon Lee [Mon, 7 Apr 2014 10:18:00 +0000 (03:18 -0700)]
Merge "SNIPPET : Refactoring snippet and template" into develop
jeonghwan kim [Mon, 7 Apr 2014 10:11:44 +0000 (19:11 +0900)]
SNIPPET : Refactoring snippet and template
Change-Id: I148e444b57dc6646c92ed5550814a6d8c447d9b8
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
jaeyeol lee [Mon, 7 Apr 2014 05:50:16 +0000 (14:50 +0900)]
DATABIND : modify the code generation for the meta file
The data source can be saved in the metafile
Change-Id: Ia1ef236e9f6c7aa7b3f8575ae556240461159a4d
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
parary [Fri, 4 Apr 2014 08:17:49 +0000 (17:17 +0900)]
DATABIND : Change and Add Source Type in Set Data Source Dialog.
Change - Runtime API -> Contact.
Add - Call History.
Add - Calendar.
Add - File System.
Change-Id: Iacaaa038741a145a3c7623b834a4a6bf1f456082
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Fri, 4 Apr 2014 07:57:25 +0000 (00:57 -0700)]
Merge "DATABIND: add sample file (callhistory.json) a. add sample file" into develop
Changyeon Lee [Fri, 4 Apr 2014 07:57:12 +0000 (00:57 -0700)]
Merge "PROP : Add reset styles." into develop
Heekyoung, Oh [Fri, 4 Apr 2014 07:49:57 +0000 (16:49 +0900)]
DATABIND: add sample file (callhistory.json)
a. add sample file
Change-Id: Ib6a789956beb9442713e9715cb13140a3abbc7cc
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
jaeyeol lee [Fri, 4 Apr 2014 07:12:26 +0000 (16:12 +0900)]
DATABIND : Modified incorrect information in the binding info panel
Change-Id: Ibcce73da03ca638cd83fd6eb98b76e27f2251ffd
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Fri, 4 Apr 2014 05:17:06 +0000 (14:17 +0900)]
PROP : Add reset styles.
Reset feature on StyleTab. When the reset button is clicked, all removed styles of current css selector.
Change-Id: I866bddeb73faf93b9bdc827e5c088d81633493db
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
parary [Thu, 3 Apr 2014 07:39:51 +0000 (16:39 +0900)]
DATABIND : Bug fix[ContactSubPage.loadData].
Change-Id: I9eb02605b23c4f78acf0342e8eb1c4d80e7c2b22
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Thu, 3 Apr 2014 07:31:04 +0000 (00:31 -0700)]
Merge "DATABIND : Bug fixed in the databinding view Bug fixed that can not load" into develop
Changyeon Lee [Thu, 3 Apr 2014 07:30:50 +0000 (00:30 -0700)]
Merge "DATABIND : Changes UI Set Data Source Contact Dialog." into develop
Changyeon Lee [Thu, 3 Apr 2014 07:30:18 +0000 (00:30 -0700)]
Merge "ANIMATOR : Keyframe add/edit command refactoring Implements logic that keyframe name modification for undo/redo. Integrate keyframe manipulation command from properties view." into develop
parary [Thu, 3 Apr 2014 07:09:05 +0000 (16:09 +0900)]
DATABIND : Changes UI Set Data Source Contact Dialog.
Change-Id: I68daf150f1fcbfe4bf35bb6d79fc03cf21344543
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Thu, 3 Apr 2014 07:03:18 +0000 (16:03 +0900)]
ANIMATOR : Keyframe add/edit command refactoring
Implements logic that keyframe name modification for undo/redo.
Integrate keyframe manipulation command from properties view.
Change-Id: I7f5dc709612e85a2e02e87fc16080c0a7bb71402
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Thu, 3 Apr 2014 06:11:38 +0000 (23:11 -0700)]
Merge "UIB : Removing warning message in feature.xml" into develop
nakyoung2.choi [Thu, 3 Apr 2014 06:10:14 +0000 (15:10 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
UIB : remove NPE
Change-Id: Icd66bdc2a68a6154d29ee85ee43218bc4fa1bdf9
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Thu, 3 Apr 2014 06:07:34 +0000 (15:07 +0900)]
DATABIND : Bug fixed in the databinding view
Bug fixed that can not load
Change-Id: I41cb1318e1ebaf12a0fd12c89b00e0b98e72777a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jeonghwan kim [Thu, 3 Apr 2014 04:55:09 +0000 (13:55 +0900)]
UIB : Removing warning message in feature.xml
Change-Id: Idf3bfd5148952a03bf291cd5c0403b1d7578ef3b
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
gyeongmin.ju [Thu, 3 Apr 2014 01:18:40 +0000 (10:18 +0900)]
UIB : remove NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I40989148b1950f55346b5c2252ec5d7adc9cf645
nakyoung2.choi [Wed, 2 Apr 2014 08:21:19 +0000 (17:21 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
UIB : modify inner class scope
DATABIND : bug Fix remove combo in Tree.
ANIMATOR : Bug fix for predefined animation insertion Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted
DATABIND : Remove unused fields.
DATABIND : Change the Data Source Dialog Return Type.
ANIMATOR : Bug fix for removed property value Put all property to map before edit properties
ANIMATOR : Change keyframe add/edit policy Add only property that user put in and write tempolary computed properties to CSS
PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes.
DATABIND : Remove NPE.
UIB: remove NPE
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorModelManager.java
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Change-Id: Ic4e37e9510cfe82110a56e37c2539c7864ae9ecf
Changyeon Lee [Tue, 1 Apr 2014 09:25:20 +0000 (02:25 -0700)]
Merge "ANIMATOR : Bug fix for predefined animation insertion Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted" into develop
Changyeon Lee [Tue, 1 Apr 2014 09:25:08 +0000 (02:25 -0700)]
Merge "DATABIND : bug Fix remove combo in Tree." into develop
gyeongmin.ju [Tue, 1 Apr 2014 09:24:30 +0000 (18:24 +0900)]
UIB : modify inner class scope
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ib8e03a37d3a132db9798fbf9e8e60779bfac62ad
parary [Tue, 1 Apr 2014 08:31:25 +0000 (17:31 +0900)]
DATABIND : bug Fix remove combo in Tree.
Change-Id: Icdb3077e46455a8f403432bb10fa1ff5ae52ed8e
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Tue, 1 Apr 2014 07:37:32 +0000 (16:37 +0900)]
ANIMATOR : Bug fix for predefined animation insertion
Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted
Change-Id: I3cccf66e92f022ce8daa21c62af7d1af727835ba
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Tue, 1 Apr 2014 04:26:52 +0000 (21:26 -0700)]
Merge "DATABIND : Remove unused fields." into develop
Changyeon Lee [Tue, 1 Apr 2014 04:26:44 +0000 (21:26 -0700)]
Merge "DATABIND : Change the Data Source Dialog Return Type." into develop
parary [Tue, 1 Apr 2014 03:43:55 +0000 (12:43 +0900)]
DATABIND : Remove unused fields.
Change-Id: Id60faef0e3b0419ab4d55c0ec1bf790fa489c9e9
Signed-off-by: parary <kyunghan80.park@samsung.com>
parary [Tue, 1 Apr 2014 03:34:27 +0000 (12:34 +0900)]
DATABIND : Change the Data Source Dialog Return Type.
Change-Id: Ic5ccc22e7a286e680519d3dc186f7cc5681ee5d5
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Mon, 31 Mar 2014 09:13:04 +0000 (18:13 +0900)]
ANIMATOR : Bug fix for removed property value
Put all property to map before edit properties
Change-Id: Ibf113ed01744000103adfca629669f0a7c98d512
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Mon, 31 Mar 2014 07:46:09 +0000 (16:46 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
ANIMATOR : Change keyframe add/edit policy Add only property that user put in and write tempolary computed properties to CSS
PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes.
DATABIND : Remove NPE.
UIB: remove NPE
Change-Id: I4b004d125394b5dd496e22c52a8c92381f73e672
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 31 Mar 2014 07:13:59 +0000 (00:13 -0700)]
Merge "PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes." into develop
Changyeon Lee [Mon, 31 Mar 2014 07:13:52 +0000 (00:13 -0700)]
Merge "DATABIND : Remove NPE." into develop
projects / sdk / ide / web-ui-builder-eplugin.git / log