lp:~benoit.soyeux/tomdroid/sortingNote

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~tomdroid-maintainers/tomdroid/main

Benoit Garret: Needs Fixing on 2010-11-29

Diff: 2357 lines (+2023/-31) (has conflicts)

21 files modified

.classpath (+2/-2)
AndroidManifest.xml (+5/-5)
data/icon-src/NotebookFilter.svg (+562/-0)
data/icon-src/icon-sort.svg (+248/-0)
data/icon-src/preferences.svg (+565/-0)
res/layout/notebooks.xml (+36/-0)
res/layout/notebooks_list_item.xml (+38/-0)
res/menu/main.xml (+15/-6)
res/values-fr/arrays.xml (+2/-2)
res/values-fr/strings.xml (+13/-0)
res/values/strings.xml (+12/-0)
res/xml/preferences.xml (+2/-1)
src/org/tomdroid/Note.java (+2/-2)
src/org/tomdroid/NoteManager.java (+134/-4)
src/org/tomdroid/NoteProvider.java (+2/-3)
src/org/tomdroid/Notebook.java (+7/-0)
src/org/tomdroid/NotebookProvider.java (+227/-0)
src/org/tomdroid/ui/Notebooks.java (+94/-0)
src/org/tomdroid/ui/PreferencesActivity.java (+10/-0)
src/org/tomdroid/ui/Tomdroid.java (+45/-4)
tests/org/tomdroid/NoteManagerTest.java (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

223. By Benoit Soyeux on 2010-11-28

the Notebook filter functionality is now ended. it could be merge.

222. By Benoit Soyeux on 2010-11-25

Add the new functionnality : filter list on notebook

221. By Benoit Soyeux on 2010-11-23

Add a list of notebook

220. By Benoit Soyeux on 2010-11-22

Add a notebookProvider and declare it to android manifest

219. By Benoit Soyeux on 2010-11-21

test to add notebook table

218. By Benoit Soyeux on 2010-11-17

another test to commit

217. By Benoit Soyeux on 2010-11-17

begin of notebook filter functionality

216. By Benoit Soyeux on 2010-11-15

Add the begin of notebook filter functionality

215. By Benoit Soyeux on 2010-11-01

Add icon forview sorting

214. By Benoit Soyeux on 2010-10-18

Add the function to sort note by date or by name