aboutsummaryrefslogtreecommitdiffstats
path: root/wip
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-13 04:18:57 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-13 04:18:57 -0700
commite4325bc56580a8e6df7aca64b9d101f10c5fc782 (patch)
tree69fdf6544e79db80ec564735633ad7be805d1b50 /wip
parentc3273dfcdc6d4dec893e7ae755a647e88665c815 (diff)
downloadvolse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.tar.gz
volse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.tar.bz2
volse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.zip
.
Diffstat (limited to 'wip')
-rw-r--r--wip/todo18
1 files changed, 9 insertions, 9 deletions
diff --git a/wip/todo b/wip/todo
index ca5c298ae..be2a38159 100644
--- a/wip/todo
+++ b/wip/todo
@@ -7,13 +7,13 @@ profile photo to self contact page? - resolve profile photo inconsistency
use photo hash to notify of changes?
-contact editor
- block photo
+>>>>>>>>contact editor
+>>>>>>>> block photo
-profile "you name it" field
+>>>>>>>>profile "you name it" field
-group - delete, theme
+group - delete (keep id in acl lists to prvent them from breaking security)
pager - photos
@@ -21,13 +21,13 @@ photos/albums/ java uploader
item delete
-item edit
+>>>>>>>>item edit
dfrn_poll - import items
-local/remote indicator
+>>>>>>>>local/remote indicator
-side/text
+>>>>>>>>side/text
notififier abstraction
@@ -48,9 +48,9 @@ email
chat
-plugin api
+>>>>>>>>plugin api
-theme api
+>>>>>>>>theme api
ajax