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

5fe61296

Commit 5fe61296 authored 12 years ago by Tom Needham

Downloads
- Plain Diff

Merge master into ocs_api, fix conflicts.

parents 4facd766 f0893fb8

No related branches found

No related tags found

No related merge requests found

Changes 1000

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
.gitmodules 0 additions, 3 deletions

.gitmodules
.htaccess 13 additions, 0 deletions

.htaccess
README 2 additions, 1 deletion

README
apps/files/admin.php 3 additions, 2 deletions

apps/files/admin.php
apps/files/ajax/autocomplete.php 1 addition, 1 deletion

apps/files/ajax/autocomplete.php
apps/files/ajax/list.php 1 addition, 1 deletion

apps/files/ajax/list.php
apps/files/ajax/move.php 6 additions, 1 deletion

apps/files/ajax/move.php
apps/files/ajax/newfile.php 1 addition, 0 deletions

apps/files/ajax/newfile.php
apps/files/ajax/timezone.php 1 addition, 4 deletions

apps/files/ajax/timezone.php
apps/files/ajax/upload.php 21 additions, 13 deletions

apps/files/ajax/upload.php
apps/files/appinfo/app.php 5 additions, 1 deletion

apps/files/appinfo/app.php
apps/files/appinfo/filesync.php 13 additions, 13 deletions

apps/files/appinfo/filesync.php
apps/files/appinfo/remote.php 7 additions, 3 deletions

apps/files/appinfo/remote.php
apps/files/appinfo/routes.php 11 additions, 0 deletions

apps/files/appinfo/routes.php
apps/files/appinfo/update.php 13 additions, 9 deletions

apps/files/appinfo/update.php
apps/files/css/files.css 44 additions, 29 deletions

apps/files/css/files.css
apps/files/download.php 2 additions, 2 deletions

apps/files/download.php
apps/files/index.php 10 additions, 9 deletions

apps/files/index.php
apps/files/js/fileactions.js 116 additions, 115 deletions

apps/files/js/fileactions.js

with 271 additions and 207 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

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