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

..

admin_audit

audit: update appinfo to OC4

2012-08-03 16:05:48 +02:00

admin_dependencies_chk

[tx-robot] updated from transifex

2012-08-20 02:03:51 +02:00

admin_migrate

[tx-robot] updated from transifex

2012-08-20 02:01:32 +02:00

bookmarks

Optimized image size

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

calendar

Merge branch 'share_api'

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

contacts

Merge branch 'share_api'

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

external

Optimized image size

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

files

Merge branch 'share_api'

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

files_archive

Merge branch 'share_api'

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

files_encryption

[tx-robot] updated from transifex

2012-08-20 02:01:32 +02:00

files_external

Merge branch 'share_api'

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

files_imageviewer

Merge branch 'share_api'

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

files_pdfviewer

Make file actions permissions aware

2012-07-25 16:33:08 -04:00

files_sharing

Merge branch 'share_api'

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

files_sharing_log

latin1 => utf8

2012-07-16 01:46:16 +02:00

files_texteditor

Make file actions permissions aware

2012-07-25 16:33:08 -04:00

files_versions

Merge branch 'share_api'

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

gallery

Merge branch 'share_api'

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

media

Merge branch 'share_api'

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

remoteStorage

Optimized image size

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

tasks

[tx-robot] updated from transifex

2012-08-20 02:01:32 +02:00

user_external

ftp user backend

2012-07-19 23:03:02 +02:00

user_ldap

[tx-robot] updated from transifex

2012-08-20 02:03:51 +02:00

user_migrate

[tx-robot] updated from transifex

2012-08-17 00:45:46 +02:00

user_openid

[tx-robot] updated from transifex

2012-08-20 02:01:32 +02:00

user_webfinger

Fix webfinger documentation

2012-08-15 14:50:25 +02:00

.gitkeep

…