# HG changeset patch # User Harris Baptiste # Date 1465288720 -7200 # Node ID fb9820d79ef6a1a45654b8935475c8fdbd68f725 # Parent 34b1309ce2a14ae63abea67578703dd28bf25109 design doc diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/edit_detail_fragment.png Binary file design/iconolab/demo/pages/edit_detail_fragment.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/edit_fragment_with_conflict.png Binary file design/iconolab/demo/pages/edit_fragment_with_conflict.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/save_detail_fragment.png Binary file design/iconolab/demo/pages/save_detail_fragment.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/suggestion.png Binary file design/iconolab/demo/pages/suggestion.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/suggestions_images.png Binary file design/iconolab/demo/pages/suggestions_images.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/suggestions_tags.png Binary file design/iconolab/demo/pages/suggestions_tags.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/demo/pages/user_suggestion.png Binary file design/iconolab/demo/pages/user_suggestion.png has changed diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/dossier.ep --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/iconolab/dossier.ep Tue Jun 07 10:38:40 2016 +0200 @@ -0,0 +1,218 @@ + +Untitled Page1464595680665_913711912074#ffffff + + + + + + + + + + Trouver une image... + + + + + Rechercher + + + + + Musée d'Ingres + + + + + Notifications + + + + + 10 + + + + + + + + + + + + + + + +
utilisateur 1
+ + + + + + + + + + + + Créer un dossier + + + + + Dossier + + + + + + +
Paris, belle époque
+ + + +
Editer
+ + + + + ]]> + + + +
10
 + + + + + +
23
 + + + + + + +
50
 + + + + + + + + +
Paris, belle époque
+ + + +
Editer
+ + ]]> + + + +
10
 + + + + + +
23
 + + + + + + +
50
 + + + + + + + + +
Paris, belle époque
+ + + +
Editer
+ + ]]> + + + +
10
 + + + + + +
23
 + + + + + + +
50
 + + + + + + + + \ No newline at end of file diff -r 34b1309ce2a1 -r fb9820d79ef6 design/iconolab/mergetools.ep --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/design/iconolab/mergetools.ep Tue Jun 07 10:38:40 2016 +0200 @@ -0,0 +1,966 @@ + +Untitled Page1460370811093_495211912074#ffffffuntitled_page + + + + + + + + + + + + + +
Diff
 + + + + +
Diff
 + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accepter + + + + + Rejeter + images diff1460451065767_775211912074true#FFFFFFFFtransparentimages_diff + + + + + + + + + + + + + +
Diff
 + + + + +
Diff
 + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accepter + + + + + Rejeter + + + + X]]> + + + +
X
 + + + + + + + + + + + + + + + + + + + + + + tags diff1460468148393_217811912074true#FFFFFFFFtransparenttags_diff + + + + + + + + + + + + + +
3 Diff
 + + + + +
Diff
 + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accepter + + + + + Rejeter + ]]> + + + +

+ ]]> + + + +

+ + + ]]> + + + + + + + + + + +
Actions
+ + + + + +
X
 + + + + + + + + E + + + + + + R + + + + + + A + conflict1460474781114_746111912074true#FFFFFFFFtransparent + + + + + + + + + + + + + +
Diff
 + + + + +
Diff
 + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accepter + + + + + Rejeter + + + + +
!
 + + + + + Ce fragment n'est pas à jour. cliquer pour notifier son créateur. + + + + + L'utilisateur sera notifié + + + + +
!
 + \ No newline at end of file diff -r 34b1309ce2a1 -r fb9820d79ef6 src/db.sqlite3 Binary file src/db.sqlite3 has changed