Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ...

Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php

2012-08-19 22:29:01 -04:00

..

ajax

Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.

2012-08-19 22:14:38 -04:00

css

Position appsettings fixed and load it in dynamically added element.

2012-08-12 18:42:54 +02:00

img

Optimized image size

2012-08-18 13:56:04 +02:00

js

Merge branch 'share_api'

2012-08-19 22:29:01 -04:00

l10n

[tx-robot] updated from transifex

2012-08-12 02:04:58 +02:00

lostpassword

fix for bug #1295, don't escape password reset link

2012-07-27 15:35:36 +02:00

templates

Use OC_Util::displayLoginPage and cleanup the function

2012-08-10 11:43:04 +02:00

minimizer.php

Use TemplateLayout functions for finding js and css files in minimizer

2012-06-18 15:40:48 +02:00

strings.php

remove superfluous ?> at the end of .php files (left out apps/*/templates)

2012-07-09 16:51:16 +02:00