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

6c469238

Commit 6c469238 authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar

parents 3d498002 7df9d934

No related branches found

No related tags found

No related merge requests found

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
apps/external/ajax/seturls.php 10 additions, 10 deletions

apps/external/ajax/seturls.php
apps/external/appinfo/app.php 5 additions, 5 deletions

apps/external/appinfo/app.php
apps/external/index.php 1 addition, 1 deletion

apps/external/index.php
apps/external/settings.php 10 additions, 10 deletions

apps/external/settings.php
apps/files_sharing/ajax/getitem.php 1 addition, 1 deletion

apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php 1 addition, 1 deletion

apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php 1 addition, 1 deletion

apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/unshare.php 1 addition, 1 deletion

apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php 1 addition, 1 deletion

apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/share.js 1 addition, 1 deletion

apps/files_sharing/js/share.js
apps/media/lib_ampache.php 6 additions, 6 deletions

apps/media/lib_ampache.php
apps/media/lib_scanner.php 2 additions, 4 deletions

apps/media/lib_scanner.php
apps/user_ldap/appinfo/app.php 4 additions, 1 deletion

apps/user_ldap/appinfo/app.php
apps/user_ldap/settings.php 8 additions, 1 deletion

apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php 10 additions, 6 deletions

apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php 45 additions, 8 deletions

apps/user_ldap/user_ldap.php
lib/config.php 0 additions, 1 deletion

lib/config.php
lib/setup.php 2 additions, 0 deletions

lib/setup.php
lib/updater.php 91 additions, 0 deletions

lib/updater.php

with 201 additions and 59 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