Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

6f049d08

Commit 6f049d08 authored 12 years ago by Michael Gapczynski

Downloads
- Plain Diff

Merge branch 'filesystem' into filesystem-etags

parents 9e2f3a53 36cac7f9

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_external/lib/google.php 1 addition, 1 deletion

apps/files_external/lib/google.php
apps/files_sharing/lib/cache.php 22 additions, 2 deletions

apps/files_sharing/lib/cache.php
apps/files_sharing/lib/permissions.php 7 additions, 7 deletions

apps/files_sharing/lib/permissions.php
apps/files_sharing/lib/share/file.php 3 additions, 0 deletions

apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php 9 additions, 2 deletions

apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php 0 additions, 6 deletions

apps/files_sharing/lib/sharedstorage.php
db_structure.xml 1 addition, 1 deletion

db_structure.xml
lib/files/view.php 28 additions, 18 deletions

lib/files/view.php
lib/public/share.php 4 additions, 1 deletion

lib/public/share.php
lib/util.php 1 addition, 1 deletion

lib/util.php

with 76 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment