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

e1e4c7c2

Commit e1e4c7c2 authored 11 years ago by Björn Schießle

Downloads
- Plain Diff

Merge branch 'master' into fix_file_cache_updater_master

parents 0d7d396d e08f38f9

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/js/file-upload.js 7 additions, 2 deletions

apps/files/js/file-upload.js
apps/files_sharing/css/public.css 13 additions, 15 deletions

apps/files_sharing/css/public.css
apps/files_sharing/js/share.js 2 additions, 2 deletions

apps/files_sharing/js/share.js
core/ajax/share.php 2 additions, 1 deletion

core/ajax/share.php
core/js/share.js 23 additions, 9 deletions

core/js/share.js
lib/private/files/cache/cache.php 4 additions, 0 deletions

lib/private/files/cache/cache.php
lib/private/files/type/detection.php 6 additions, 2 deletions

lib/private/files/type/detection.php
lib/private/urlgenerator.php 5 additions, 5 deletions

lib/private/urlgenerator.php
lib/private/user.php 16 additions, 9 deletions

lib/private/user.php
lib/private/user/manager.php 14 additions, 0 deletions

lib/private/user/manager.php
lib/public/share.php 37 additions, 23 deletions

lib/public/share.php

with 129 additions and 68 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