Brice Maron 37b07e4e2d Merge branch 'master' into multi_app_dir ...

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

2012-06-21 17:15:35 +00:00

ajax

Merge branch 'master' into multi_app_dir

2012-06-21 17:15:35 +00:00

appinfo

utf8 in der DB config

2012-06-11 23:04:28 +02:00

css

bookmarks: make read later-button draggable again, fixes oc-944

2012-06-20 19:43:02 +02:00

img

initial commit of Bookmarks App

2011-08-15 22:05:07 +02:00

js

Using POST instead of GET.

2012-06-10 23:38:26 +02:00

l10n

Added searchprovider for bookmarks, initial l10n support for bookmark plugin

2012-02-01 15:40:59 +01:00

lib

removing executable bit - again

2012-05-15 00:52:00 +02:00

templates

Merge branch 'master' into multi_app_dir

2012-06-21 17:15:35 +00:00

addBm.php

make bookmarks bookmarklet work again, kudos to Victor Dubiniuk

2012-06-20 20:03:25 +02:00

bookmarksHelper.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

index.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

settings.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

Description

Bookmark app for ownCloud

4.7 MiB

Languages

PHP 55.9%

JavaScript 41.7%

CSS 2.4%