sumanth [Mon, 12 Mar 2012 14:35:26 +0000 (20:05 +0530)]
[elm_conformant.c] default contetnt part is removed.
sumanth [Mon, 12 Mar 2012 13:48:41 +0000 (19:18 +0530)]
[elm_conform]: content area get removed instead content_set is used, popup can use elm_object_content_get instead of content_area_get
ChunEon Park [Mon, 12 Mar 2012 11:12:34 +0000 (20:12 +0900)]
elementary/index - fixed null string case segfault
sumanth [Mon, 12 Mar 2012 10:52:51 +0000 (16:22 +0530)]
[datetime_input_ctxpopup.c] Hide ctxpopup in dismissed_cb().
Jaehwan Kim [Mon, 12 Mar 2012 09:20:48 +0000 (18:20 +0900)]
Delete the object, when the item is deleted.
Jaehwan Kim [Mon, 12 Mar 2012 09:20:17 +0000 (18:20 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Tae-Hwan Kim [Mon, 12 Mar 2012 08:01:48 +0000 (17:01 +0900)]
[Map] Temporary bug fix. It will be merged to upstream ASAP.
Change-Id: Id829e291d6eb854d4821ea96e8da642f058f96f5
Tae-Hwan Kim [Mon, 12 Mar 2012 08:01:48 +0000 (17:01 +0900)]
[Map] Temporary bug fix. It will be merged to upstream ASAP.
Change-Id: Id829e291d6eb854d4821ea96e8da642f058f96f5
Hyoyoung Chang [Mon, 12 Mar 2012 07:36:48 +0000 (16:36 +0900)]
[genlist] minor fix indent
Hyoyoung Chang [Mon, 12 Mar 2012 06:55:22 +0000 (15:55 +0900)]
[genlist] minor code indent fix
Hyoyoung Chang [Mon, 12 Mar 2012 06:06:19 +0000 (15:06 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Hyoyoung Chang [Mon, 12 Mar 2012 06:06:00 +0000 (15:06 +0900)]
[genlist] bugfix decorate_all mode sizing problem
Jeonghyun Yun [Mon, 12 Mar 2012 05:52:46 +0000 (14:52 +0900)]
tickernoti temp added
Shinwoo Kim [Mon, 12 Mar 2012 05:22:22 +0000 (14:22 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Shinwoo Kim [Mon, 12 Mar 2012 05:22:11 +0000 (14:22 +0900)]
[diskselector] opensource merge - fix datetime issue
Hyoyoung Chang [Mon, 12 Mar 2012 04:59:26 +0000 (13:59 +0900)]
[genlist] merged with upstream
Hyoyoung Chang [Mon, 12 Mar 2012 04:26:38 +0000 (13:26 +0900)]
[genlist] change old item style to current naming
Hyoyoung Chang [Mon, 12 Mar 2012 02:05:46 +0000 (11:05 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Hyoyoung Chang [Mon, 12 Mar 2012 02:05:20 +0000 (11:05 +0900)]
[genlist] naming change - edit_mode->decorate_mode
WooHyun Jung [Mon, 12 Mar 2012 01:58:18 +0000 (10:58 +0900)]
[*][naviframe] fix focus problem
Jung Chanwook [Mon, 12 Mar 2012 01:45:31 +0000 (10:45 +0900)]
[genlist] edit mode
ChunEon Park [Sun, 11 Mar 2012 13:12:38 +0000 (22:12 +0900)]
config - updated to sync with opensource code
Jeonghyun Yun [Sun, 11 Mar 2012 11:39:48 +0000 (20:39 +0900)]
controlbar error fixed
Jeonghyun Yun [Sun, 11 Mar 2012 11:32:06 +0000 (20:32 +0900)]
controlbar added
Tae-Hwan Kim [Sun, 11 Mar 2012 07:51:17 +0000 (16:51 +0900)]
Remove controlbar, use toolbar instead
Change-Id: I2890670da90ce8c053a6a56a372fa928761a75ba
Tae-Hwan Kim [Sun, 11 Mar 2012 06:56:02 +0000 (15:56 +0900)]
Remove unused files (elm_popup --> elc_popup)
Change-Id: I3fe0afbd7a2ec2410122bcabacd8924fe62055f5
Jaehwan Kim [Fri, 9 Mar 2012 06:48:20 +0000 (15:48 +0900)]
add the emit for efl-theme-tizen
shilpa singh [Sat, 10 Mar 2012 13:14:10 +0000 (18:44 +0530)]
[elm_colorselector]: take padding values on theme change.
shilpa singh [Sat, 10 Mar 2012 12:18:07 +0000 (17:48 +0530)]
[dayselector]: demo code modified to support sunday
shilpa singh [Sat, 10 Mar 2012 06:34:05 +0000 (12:04 +0530)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
shilpa singh [Sat, 10 Mar 2012 06:32:33 +0000 (12:02 +0530)]
[elm_colorselector]: merged from Opensource 2. config/slp updated with
dayselector and colorselector parameters
ChunEon Park [Sat, 10 Mar 2012 06:27:07 +0000 (15:27 +0900)]
elemenatry/naviframe - removed unsupported item signal callbacks
Myoungwoon Kim [Sat, 10 Mar 2012 03:52:44 +0000 (12:52 +0900)]
Add WRAPPER for booting
Jeonghyun Yun [Sat, 10 Mar 2012 02:14:34 +0000 (11:14 +0900)]
elm_fonts.h removed
Jaehwan Kim [Fri, 9 Mar 2012 10:22:02 +0000 (19:22 +0900)]
fix build error - elm_entry
Jaehwan Kim [Fri, 9 Mar 2012 10:00:02 +0000 (19:00 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jaehwan Kim [Fri, 9 Mar 2012 09:59:47 +0000 (18:59 +0900)]
fix build error - elm_controlbar.c
WooHyun Jung [Fri, 9 Mar 2012 09:07:30 +0000 (18:07 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
WooHyun Jung [Fri, 9 Mar 2012 09:07:25 +0000 (18:07 +0900)]
[Entry] magnifier codes are added again
sumanth [Fri, 9 Mar 2012 09:05:29 +0000 (14:35 +0530)]
Removed APIs are added in elm_removed.h
Jung Chanwook [Fri, 9 Mar 2012 08:13:24 +0000 (17:13 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jung Chanwook [Fri, 9 Mar 2012 08:13:16 +0000 (17:13 +0900)]
[genlist] fix the build error
sumanth [Fri, 9 Mar 2012 08:11:37 +0000 (13:41 +0530)]
[dayselector] elm_dayselector.c, elm_dayselector.h files are removed. Datetime, Dayselector test cases are removed.
WooHyun Jung [Fri, 9 Mar 2012 07:06:48 +0000 (16:06 +0900)]
fix build break in elm_entry
Shinwoo Kim [Fri, 9 Mar 2012 06:30:10 +0000 (15:30 +0900)]
[ctxpopup] fix build error which is from fixing merge
Tae-Hwan Kim [Fri, 9 Mar 2012 06:21:21 +0000 (15:21 +0900)]
Fix conflicts: Map, Hover, Hoversel, Menu, Web
Change-Id: I5c6d681cfaf2b5430a56aa15ffb8fe67f70e113e
Jaehwan Kim [Fri, 9 Mar 2012 06:19:29 +0000 (15:19 +0900)]
fix conflict test_cursor.c
sumanth [Fri, 9 Mar 2012 06:19:29 +0000 (11:49 +0530)]
[actionslider,calendar,conform] Deprecated API support is deleted from the widgets.
Jaehwan Kim [Fri, 9 Mar 2012 06:11:16 +0000 (15:11 +0900)]
fix conflict test_focus.c
sumanth [Fri, 9 Mar 2012 06:00:15 +0000 (11:30 +0530)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
sumanth [Fri, 9 Mar 2012 05:57:50 +0000 (11:27 +0530)]
[svn merge <sumanth>] actionslider,calendar,clock,conformant,slider widgets related merge conflicts are fixed.
Jung Chanwook [Fri, 9 Mar 2012 05:47:51 +0000 (14:47 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jung Chanwook [Fri, 9 Mar 2012 05:47:45 +0000 (14:47 +0900)]
[Genlist] test_genlist.c upstream merge
ChunEon Park [Fri, 9 Mar 2012 05:14:46 +0000 (14:14 +0900)]
3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout - removed conflicsts
Jiyoun Park [Fri, 9 Mar 2012 03:16:51 +0000 (12:16 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jiyoun Park [Fri, 9 Mar 2012 03:01:46 +0000 (12:01 +0900)]
migration merge<Jiyoun Park>
Shinwoo Kim [Fri, 9 Mar 2012 02:37:39 +0000 (11:37 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Shinwoo Kim [Fri, 9 Mar 2012 02:37:23 +0000 (11:37 +0900)]
[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip (lib only)
Goun Lee [Fri, 9 Mar 2012 01:20:15 +0000 (10:20 +0900)]
[label]merged with opensource(elm_label.c)
Goun Lee [Fri, 9 Mar 2012 01:14:02 +0000 (10:14 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:21922/slp/pkgs/e/elementary into intefl/svn_merge
Jung Chanwook [Fri, 9 Mar 2012 01:04:55 +0000 (10:04 +0900)]
[genlist] merge samsung feature
shilpa singh [Thu, 8 Mar 2012 13:18:50 +0000 (18:48 +0530)]
elementary merging.
Shinwoo Kim [Thu, 8 Mar 2012 13:08:01 +0000 (22:08 +0900)]
[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip (theme, doc and bin only)
minseok3.kim [Thu, 8 Mar 2012 12:14:17 +0000 (21:14 +0900)]
Merge branch 'intefl/svn_merge' of 165.213.149.219:/slp/pkgs/e/elementary into intefl/svn_merge
minseok3.kim [Thu, 8 Mar 2012 12:03:22 +0000 (21:03 +0900)]
[cnp] merge with opensource
Jeonghyun Yun [Thu, 8 Mar 2012 11:38:36 +0000 (20:38 +0900)]
src/lib conflict fixed
Rajeev Ranjan [Thu, 8 Mar 2012 11:19:39 +0000 (16:49 +0530)]
[Elementary migration] panes,flip,notify and slideshow widgets merged.
Jaehwan Kim [Thu, 8 Mar 2012 11:02:11 +0000 (20:02 +0900)]
Merge "elm toolbar: Formatting."
Jaehwan Kim [Thu, 8 Mar 2012 11:02:04 +0000 (20:02 +0900)]
Merge "warn+bug--"
Goun Lee [Thu, 8 Mar 2012 10:44:30 +0000 (19:44 +0900)]
[index]Fixed conflicts (elm_index.c/elm_index.h)
Goun Lee [Thu, 8 Mar 2012 10:40:38 +0000 (19:40 +0900)]
[index]Fixed Conflicts
Goun Lee [Thu, 8 Mar 2012 10:27:56 +0000 (19:27 +0900)]
[multibuttonentry]Fixed Conflicts
Rajeev Ranjan [Thu, 8 Mar 2012 09:51:18 +0000 (15:21 +0530)]
SVN Merging for button, radio, check and toggle
Jeonghyun Yun [Thu, 8 Mar 2012 09:06:40 +0000 (18:06 +0900)]
src/lib conflict fixed
Myungjae Lee [Thu, 8 Mar 2012 08:52:10 +0000 (17:52 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Myungjae Lee [Thu, 8 Mar 2012 08:52:07 +0000 (17:52 +0900)]
[migration] fixed conflicts in files
Change-Id: I0ffdf0db632e66a6b097627a19712a1208a4e2d0
Jung Chanwook [Thu, 8 Mar 2012 08:32:33 +0000 (17:32 +0900)]
[genlist] merge upstream 2nd
Jung Chanwook [Thu, 8 Mar 2012 08:28:25 +0000 (17:28 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jung Chanwook [Thu, 8 Mar 2012 08:28:18 +0000 (17:28 +0900)]
[elm_genlist.c] merge upstream 1st
Myungjae Lee [Thu, 8 Mar 2012 08:23:44 +0000 (17:23 +0900)]
[migration] fixed conflicts in files
Change-Id: Iac202669ab393604b35fc32f826dafcc5d05ea44
WooHyun Jung [Thu, 8 Mar 2012 07:47:09 +0000 (16:47 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
WooHyun Jung [Thu, 8 Mar 2012 07:47:03 +0000 (16:47 +0900)]
[Entry] elm_entry.h merge finished
Hyoyoung Chang [Thu, 8 Mar 2012 07:33:29 +0000 (16:33 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jeonghyun Yun [Thu, 8 Mar 2012 07:33:16 +0000 (16:33 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Hyoyoung Chang [Thu, 8 Mar 2012 07:33:12 +0000 (16:33 +0900)]
[genlist] merge with local source
Change-Id: Ieb665cfa1e5bfa747609f60d09591bfc1954a85e
Jeonghyun Yun [Thu, 8 Mar 2012 07:33:09 +0000 (16:33 +0900)]
src/examples conflict fixed
WooHyun Jung [Thu, 8 Mar 2012 07:32:24 +0000 (16:32 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
WooHyun Jung [Thu, 8 Mar 2012 07:32:19 +0000 (16:32 +0900)]
[entry] merge finished
Jeonghyun Yun [Thu, 8 Mar 2012 07:22:56 +0000 (16:22 +0900)]
src/bin src/edje_external conflict fixed
Hyoyoung Chang [Thu, 8 Mar 2012 07:19:21 +0000 (16:19 +0900)]
[genlist] no scale at theme_hook
Change-Id: I0bfb156dafc5cf3a2c212e20370ba9643bcb950c
Hyoyoung Chang [Thu, 8 Mar 2012 07:18:37 +0000 (16:18 +0900)]
[genlist] remove focus at flipped mode
Change-Id: I57d10f5e7ac3835f012840bc86f95aa16cfbd29f
Hyoyoung Chang [Thu, 8 Mar 2012 07:16:35 +0000 (16:16 +0900)]
[genlist] add changed_job, can_focus, calc_job checking
Change-Id: I162ed62ee6617b4a233663ef5c00057be614d6a7
Hyoyoung Chang [Thu, 8 Mar 2012 06:53:52 +0000 (15:53 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Hyoyoung Chang [Thu, 8 Mar 2012 06:53:32 +0000 (15:53 +0900)]
[genlist] merge with upstream
Change-Id: Ie3adac9c00f3d5ebc63735e6d7cc336feba743f9
Jeonghyun Yun [Thu, 8 Mar 2012 06:35:09 +0000 (15:35 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jeonghyun Yun [Thu, 8 Mar 2012 06:35:03 +0000 (15:35 +0900)]
modified
Jaehwan Kim [Thu, 8 Mar 2012 05:52:39 +0000 (14:52 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jung Chanwook [Thu, 8 Mar 2012 05:51:51 +0000 (14:51 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jaehwan Kim [Thu, 8 Mar 2012 05:51:40 +0000 (14:51 +0900)]
Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary into intefl/svn_merge
Jaehwan Kim [Thu, 8 Mar 2012 05:51:34 +0000 (14:51 +0900)]
fix conflicted files - toolbar, scroller
projects / framework / uifw / elementary.git / log