Reviewing merge request #84: Bookmarks searchprovider and l10n

Added a bookmarks searchprovider, it searches within tags, titles and urls.
Therefore some refactoring was needed, and while I was doing this I added the missing parts for l10n.

Requested by: David Iwanowitsch
Status: Closed
Source repository: daiws-owncloud:daiw_bookmarks
Target repository: owncloud:master
Created at: February 1st, 2012 11:38

Commits that would be merged:

Version 1

Version 1

039bbfd
8acc9e6

Added searchprovider for bookmarks, initial l10n support for bookmark plugin

e1381cd

Added searchprovider for bookmarks, initial l10n support for bookmark plugin

c22caa8

fix javascript

7b0c93d

Merge branch 'daiw_bookmarks' of git://gitorious.org/~daiw/owncloud/daiws-owncloud into daiw_bookmarks

Showing

Showing 039bbfd-8acc9e6

Comments
Include comments entered inline

Pushed new version 1

David Iwanowitsch | 2012-02-01 11:39:16 UTC

→ State changed from Open to Closed

Thanks for the work, merged.

Robin Appelman | 2012-02-01 14:40:46 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/84

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/owncloud/owncloud.git \
  refs/merge-requests/84

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/84

# To apply the changes to your branch:
git checkout master
git merge merge-requests/84
git push origin master

Reviewing merge request #84: Bookmarks searchprovider and l10n

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline