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

7c9d9992

Commit 7c9d9992 authored 11 years ago by Jörn Friedrich Dreyer

Downloads
- Patches
- Plain Diff

reduced complexity, added listing conflicts to dialog

parent bf04daff

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

apps/files/ajax/upload.php
apps/files/css/files.css 38 additions, 15 deletions

apps/files/css/files.css
apps/files/js/file-upload.js 162 additions, 64 deletions

apps/files/js/file-upload.js
core/js/oc-dialogs.js 189 additions, 116 deletions

core/js/oc-dialogs.js

with 390 additions and 195 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