Bookmark app for ownCloud

Brice Maron f61dc7cf43 Merge branch 'master' into bookmark_rework ... Conflicts: bookmarks/addBm.php bookmarks/ajax/editBookmark.php bookmarks/bookmarksHelper.php bookmarks/lib/bookmarks.php bookmarks/lib/search.php bookmarks/templates/bookmarklet.php bookmarks/templates/list.php		2012-09-18 19:39:53 +00:00
ajax	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
appinfo	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
css	Almost working in inline bookmark edit/add.	2012-09-02 15:18:36 +00:00
img	Add slider to colapse tag filter	2012-08-30 20:59:24 +00:00
js	Correct remove tag filtering problem	2012-09-02 22:09:12 +00:00
l10n	[tx-robot] updated from transifex	2012-09-18 02:03:55 +02:00
lib	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
templates	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
addBm.php	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
bookmarksHelper.php	Merge branch 'master' into bookmark_rework	2012-09-18 19:39:53 +00:00
index.php	First step^of removing the popup. Adding js templating and inline editing of bookmark	2012-09-01 14:18:39 +00:00
settings.php	Fix some bookmark import styles	2012-09-02 20:55:08 +00:00