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

9bab05fd

Commit 9bab05fd authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into fixing-gallery-password-protected-access-master

parents c57c9eae 3b7fea25

No related branches found

No related tags found

Loading

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/ajax/upload.php 1 addition, 0 deletions

apps/files/ajax/upload.php
apps/files/triggerupdate.php 1 addition, 0 deletions

apps/files/triggerupdate.php
apps/files_encryption/tests/crypt.php 17 additions, 17 deletions

apps/files_encryption/tests/crypt.php
apps/files_encryption/tests/keymanager.php 2 additions, 2 deletions

apps/files_encryption/tests/keymanager.php
apps/files_encryption/tests/proxy.php 1 addition, 1 deletion

apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php 6 additions, 6 deletions

apps/files_encryption/tests/stream.php
apps/files_encryption/tests/trashbin.php 2 additions, 2 deletions

apps/files_encryption/tests/trashbin.php
apps/files_encryption/tests/util.php 6 additions, 6 deletions

apps/files_encryption/tests/util.php
apps/files_encryption/tests/webdav.php 1 addition, 1 deletion

apps/files_encryption/tests/webdav.php
apps/files_sharing/ajax/publicpreview.php 2 additions, 1 deletion

apps/files_sharing/ajax/publicpreview.php
apps/files_sharing/appinfo/update.php 1 addition, 0 deletions

apps/files_sharing/appinfo/update.php
apps/files_sharing/public.php 3 additions, 3 deletions

apps/files_sharing/public.php
apps/files_versions/lib/versions.php 76 additions, 77 deletions

apps/files_versions/lib/versions.php
apps/files_versions/tests/versions.php 188 additions, 0 deletions

apps/files_versions/tests/versions.php
lib/private/json.php 14 additions, 0 deletions

lib/private/json.php
lib/private/template/cssresourcelocator.php 1 addition, 1 deletion

lib/private/template/cssresourcelocator.php
lib/private/util.php 4 additions, 0 deletions

lib/private/util.php
lib/public/json.php 9 additions, 1 deletion

lib/public/json.php
tests/enable_all.php 1 addition, 0 deletions

tests/enable_all.php

with 336 additions and 118 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