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

65a491ea

Commit 65a491ea authored 13 years ago by Tom Needham

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

parents d9464de6 6449a456

No related merge requests found

Changes 61

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 1 deletion

.gitignore
COPYING-README 8 additions, 7 deletions

COPYING-README
apps/calendar/ajax/getcal.php 665 additions, 34 deletions

apps/calendar/ajax/getcal.php
apps/calendar/css/style.css 3 additions, 4 deletions

apps/calendar/css/style.css
apps/calendar/js/calendar.js 1 addition, 3 deletions

apps/calendar/js/calendar.js
apps/calendar/templates/settings.php 26 additions, 24 deletions

apps/calendar/templates/settings.php
apps/files_sharing/get.php 4 additions, 3 deletions

apps/files_sharing/get.php
apps/gallery/ajax/cover.php 2 additions, 5 deletions

apps/gallery/ajax/cover.php
apps/gallery/ajax/createAlbum.php 3 additions, 6 deletions

apps/gallery/ajax/createAlbum.php
apps/gallery/ajax/getAlbums.php 3 additions, 6 deletions

apps/gallery/ajax/getAlbums.php
apps/gallery/ajax/getCovers.php 8 additions, 5 deletions

apps/gallery/ajax/getCovers.php
apps/gallery/ajax/scanForAlbums.php 4 additions, 7 deletions

apps/gallery/ajax/scanForAlbums.php
apps/gallery/ajax/thumbnail.php 2 additions, 5 deletions

apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php 2 additions, 2 deletions

apps/gallery/appinfo/app.php
apps/gallery/index.php 1 addition, 0 deletions

apps/gallery/index.php
apps/gallery/lib_scanner.php 1 addition, 1 deletion

apps/gallery/lib_scanner.php
apps/media/appinfo/app.php 1 addition, 1 deletion

apps/media/appinfo/app.php
apps/media/css/music.css 2 additions, 2 deletions

apps/media/css/music.css
apps/user_openid/appinfo/info.xml 0 additions, 1 deletion

apps/user_openid/appinfo/info.xml
core/css/styles.css 2 additions, 2 deletions

core/css/styles.css

with 742 additions and 119 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