lp:~bfiller/history-service/rtm-14.09-sim-presence

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:history-service/rtm-14.09 at revision 164

Ubuntu Phablet Team: Pending requested 2014-08-22

Diff: 884 lines (+517/-56)

11 files modified

Ubuntu/History/CMakeLists.txt (+2/-0)
Ubuntu/History/historyeventmodel.cpp (+34/-20)
Ubuntu/History/historyeventmodel.h (+18/-14)
Ubuntu/History/historygroupedeventsmodel.cpp (+346/-0)
Ubuntu/History/historygroupedeventsmodel.h (+82/-0)
Ubuntu/History/historyqmlplugin.cpp (+2/-0)
Ubuntu/History/historythreadmodel.cpp (+23/-21)
Ubuntu/History/historythreadmodel.h (+2/-1)
src/event.cpp (+6/-0)
src/event.h (+1/-0)
src/types.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

164. By Bill Filler on 2014-08-22

merge from trunk - grouping events

163. By PS Jenkins bot on 2014-08-13

Releasing 0.1+14.10.20140813-0ubuntu1

162. By Renato Araujo Oliveira Filho on 2014-08-13

Added "count" property for sortproxymodel;
Added "get" function for sortproxymodel;
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot

161. By Tiago Salem Herrmann on 2014-08-13

Export canFetchMore to qml
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot

160. By PS Jenkins bot on 2014-07-30

Releasing 0.1+14.10.20140730-0ubuntu1

159. By Tiago Salem Herrmann on 2014-07-30

Fix unreadCount update.
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot

158. By PS Jenkins bot on 2014-07-25

Releasing 0.1+14.10.20140725.1-0ubuntu1

157. By Tiago Salem Herrmann on 2014-07-25

- fix attachments on thread queries
- don't query the database for null filters. Apps should use an empty filter if they want to query the whole database
- avoid performing queries when the filter is null

Approved by: PS Jenkins bot

156. By PS Jenkins bot on 2014-07-24

Releasing 0.1+14.10.20140724-0ubuntu1

155. By Tiago Salem Herrmann on 2014-07-24

Multiple fixes to HistoryThreadGroupingProxyModel:
- Update grouping also on onDataChanged()
- use rowsAboutToBeRemoved() instead of rowsRemoved() to avoid crashes
- Do not emit dataChanged for removed indexes.
- Set participants on groupForEntry() so phone comparison works
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot