[dali_1.1.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-view.h
2016-04-01 Victor Cebollada[dali_1.1.28] Merge branch 'devel/master' 53/64453/1
2016-03-30 Adeel KazmiMerge "Stop Overriding Actor::Add() & Actor::Remove...
2016-03-30 Victor CebolladaTextModel - Layout a given range of characters inside... 13/62713/6
2016-03-24 Adeel KazmiMerge "DALi Version 1.1.27" into devel/master
2016-03-24 Paul WisbeyMerge "Fix for text renderer. Set the right size in...
2016-03-23 Victor CebolladaFix for text renderer. Set the right size in order... 67/63367/1
2015-12-23 Adeel Kazmi[dali_1.1.15] Merge branch 'devel/master' 29/55429/1
2015-12-15 Adeel KazmiMerge "Change KeyboardFocusManager to always focus...
2015-12-11 Adeel KazmiMerge "Update the custom shader effects to resize the...
2015-12-11 Paul WisbeyMerge "Text - Add the color to the vertex info." into...
2015-12-11 Victor CebolladaText - Add the color to the vertex info. 90/52690/9
2015-08-06 Xiangyin Ma[dali_1.0.52] Merge branch 'devel/master' 72/45472/1
2015-07-31 Kimmo HoikkaMerge "Ability to build from different Style folders...
2015-07-30 Victor CebolladaUnderline predictive text. 73/44873/2
2015-07-30 Tom Robinson[dali_1.0.51] Merge branch 'devel/master' 87/44987/1
2015-07-28 Adeel KazmiMerge "Stop setting crazy Z value with controls (at...
2015-07-28 Paul WisbeyMerge "Text clean." into devel/master
2015-07-28 Victor CebolladaText clean. 22/44422/6
2015-07-23 Richard Huang[dali_1.0.50] Merge branch 'devel/master' 87/44587/1
2015-07-17 Kimmo HoikkaMerge "Simple implementation of ImageView." into devel...
2015-07-17 Paul WisbeyMerge "Fix for text highlight." into devel/master
2015-07-17 Kimmo HoikkaMerge "Make internal actors size match TextLabel size...
2015-07-16 Paul WisbeyMake internal actors size match TextLabel size 76/44076/3
2015-05-29 Adeel Kazmi[dali_1.0.42] Merge branch 'tizen' 11/40111/1
2015-05-19 Francisco SantosMerge remote-tracking branch 'origin/tizen' into devel... 99/39599/1
2015-05-13 Adeel KazmiMerge "Added scroll view page path effect. Allows creat...
2015-05-13 Victor CebolladaText Layout - Ellipsis the text when exceeds the bounda... 66/39266/9
2015-04-20 Francisco SantosRevert to tizen branch. 19/38419/1
2015-04-15 Ferran Sole[dali_1.0.38] Merge branch 'tizen' 64/38264/1
2015-04-14 Richard UnderhillAdded UNDERLINE_HEIGHT Property to override font metrics 34/38134/4
2015-04-10 Kingsley Stephens[dali_1.0.37] Merge branch 'tizen' 85/38085/1
2015-04-09 Paul WisbeyMerge branch 'new_text' into tizen 33/38033/2
2015-04-09 Paul WisbeyMerge "Revert "Added UNDERLINE_HEIGHT property to TextL...
2015-04-09 Paul WisbeyRevert "Added UNDERLINE_HEIGHT property to TextLabel... 32/38032/1
2015-04-09 Paul WisbeyMerge changes I26f3edb0,Iba714851 into new_text
2015-04-09 Richard UnderhillAdded UNDERLINE_HEIGHT property to TextLabel to overrid... 42/37942/5
2015-04-09 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 10/38010/1
2015-04-07 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 49/37849/2
2015-04-02 Richard UnderhillAdded TEXT_COLOR, UNDERLINE_ENABLED and UNDERLINE_COLOR... 84/37584/7
2015-03-31 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 36/37536/6
2015-03-27 Richard UnderhillAdded Drop Shadow properties and initial effect with... 37/37437/5
2015-03-20 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 11/37211/2
2015-03-19 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 09/37109/2
2015-03-17 Paul WisbeyMerge "Improved block detection for new atlases in...
2015-03-17 Victor CebolladaInternal text model inteface. 43/36943/6
2015-03-13 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 84/36784/1
2015-03-06 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 65/36465/2
2015-03-05 Paul WisbeyPrepare for Tizen 2.4 API freeze 32/36332/4