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

226aec8d

Commit 226aec8d authored 11 years ago by Florin Peter

Downloads
- Plain Diff

Merge branch 'master' into files_encryption

parents d017bbb0 6a788d1a

Branches

No related tags found

Loading

Changes 1000

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
.htaccess 4 additions, 0 deletions

.htaccess
3rdparty 1 addition, 1 deletion

3rdparty
apps/files/ajax/newfile.php 1 addition, 1 deletion

apps/files/ajax/newfile.php
apps/files/ajax/rename.php 34 additions, 19 deletions

apps/files/ajax/rename.php
apps/files/appinfo/app.php 3 additions, 1 deletion

apps/files/appinfo/app.php
apps/files/css/files.css 4 additions, 2 deletions

apps/files/css/files.css
apps/files/js/fileactions.js 8 additions, 7 deletions

apps/files/js/fileactions.js
apps/files/js/filelist.js 7 additions, 0 deletions

apps/files/js/filelist.js
apps/files/js/files.js 7 additions, 2 deletions

apps/files/js/files.js
apps/files/l10n/ar.php 5 additions, 4 deletions

apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php 8 additions, 1 deletion

apps/files/l10n/bg_BG.php
apps/files/l10n/bn_BD.php 9 additions, 8 deletions

apps/files/l10n/bn_BD.php
apps/files/l10n/ca.php 10 additions, 9 deletions

apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php 6 additions, 5 deletions

apps/files/l10n/cs_CZ.php
apps/files/l10n/cy_GB.php 2 additions, 1 deletion

apps/files/l10n/cy_GB.php
apps/files/l10n/da.php 11 additions, 8 deletions

apps/files/l10n/da.php
apps/files/l10n/de.php 20 additions, 19 deletions

apps/files/l10n/de.php
apps/files/l10n/de_DE.php 19 additions, 18 deletions

apps/files/l10n/de_DE.php
apps/files/l10n/el.php 5 additions, 4 deletions

apps/files/l10n/el.php

with 168 additions and 110 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