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

a68b597e

Commit a68b597e authored 12 years ago by Sam Tuke

Downloads
- Plain Diff

Merge branch 'master' into files_encryption

parents 015787fb 08d7b8ce

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/ajax/rename.php 1 addition, 1 deletion

apps/files/ajax/rename.php
apps/files/js/filelist.js 1 addition, 1 deletion

apps/files/js/filelist.js
apps/files/js/files.js 16 additions, 4 deletions

apps/files/js/files.js
config/config.sample.php 3 additions, 0 deletions

config/config.sample.php
core/ajax/update.php 67 additions, 0 deletions

core/ajax/update.php
core/css/styles.css 2 additions, 1 deletion

core/css/styles.css
core/templates/update.php 31 additions, 0 deletions

core/templates/update.php
lib/app.php 4 additions, 0 deletions

lib/app.php
lib/base.php 46 additions, 44 deletions

lib/base.php
lib/db.php 6 additions, 4 deletions

lib/db.php

with 177 additions and 55 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